From 70d25ff303644dd03b72baf94aad41f1093f0591 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 7 May 2013 01:10:44 +0000
Subject: [PATCH] =?UTF-8?q?fix=20#473=EF=BC=8C=20=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E9=97=BB=E7=9A=84=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/IndexController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/default/controllers/IndexController.php b/application/default/controllers/IndexController.php
index ceb58cd3..218555bd 100755
--- a/application/default/controllers/IndexController.php
+++ b/application/default/controllers/IndexController.php
@@ -70,8 +70,8 @@ class IndexController extends Zend_Controller_Action
 		
 		$this->view->news = $rows;
 		
-		$time = date("Y-m-d H:i:s",time());
-		$sql = "SELECT * FROM archive WHERE is_pub=true AND ts_published<'$time' order by ts_published desc LIMIT 12 ";
+		//$time = date("Y-m-d H:i:s",time());
+		$sql = "SELECT * FROM archive WHERE is_pub=true AND ts_published<now() and id in (select ar_catalog.aid from ar_catalog left join ar_category on ar_catalog.cid=ar_category.id where ar_category.ptype='news') order by ts_published desc LIMIT 12 ";
 		$sth = $this->db->query($sql);
 		$rows = $sth->fetchAll(PDO::FETCH_BOTH);