diff --git a/application/default/controllers/NewsController.php b/application/default/controllers/NewsController.php index 7c0784ea..b5c7e8d5 100644 --- a/application/default/controllers/NewsController.php +++ b/application/default/controllers/NewsController.php @@ -71,7 +71,10 @@ class NewsController extends Zend_Controller_Action $this->view->types=$types; - $sql = "SELECT * FROM news_archives WHERE typeid='{$row['id']}' AND ts_published<".time()." AND pub>=1 ORDER BY ts_published DESC"; + $sql = "SELECT arc.*,c.url FROM news_archives arc + left join news_catlog c ON arc.typeid=c.id + WHERE arc.typeid='{$row['id']}' AND arc.ts_published<".time()." AND arc.pub>=1 + ORDER BY arc.ts_published DESC"; $rs = $this->db->query($sql); $rows = $rs->fetchAll(); diff --git a/application/default/views/scripts/news/archive.phtml b/application/default/views/scripts/news/archive.phtml index c4cf5b50..32dd32aa 100644 --- a/application/default/views/scripts/news/archive.phtml +++ b/application/default/views/scripts/news/archive.phtml @@ -32,12 +32,6 @@ $this->headMeta()->appendName('description', mb_substr($this->infos['description -
'.$description.'
'.$description.'