From 067ab51fbd9b2f18f63fc80895476e5b0e2f9bfb Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 31 May 2006 03:12:35 +0000
Subject: Merge from 3.0 branch till 1115.

---
 demos/blog/protected/Pages/Posts/ListPost.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'demos/blog/protected/Pages/Posts/ListPost.php')

diff --git a/demos/blog/protected/Pages/Posts/ListPost.php b/demos/blog/protected/Pages/Posts/ListPost.php
index bed18222..c3b2bcc9 100644
--- a/demos/blog/protected/Pages/Posts/ListPost.php
+++ b/demos/blog/protected/Pages/Posts/ListPost.php
@@ -28,7 +28,7 @@ class ListPost extends BlogPage
 		$this->_posts=$this->DataAccess->queryPosts(
 				$this->getPostFilter(),
 				$this->getCategoryFilter(),
-				'ORDER BY create_time DESC',
+				'ORDER BY a.status DESC, create_time DESC',
 				'LIMIT '.$this->getPageOffset().','.$this->getPageSize());
 		if($this->Request['cat']!==null)
 		{
@@ -36,6 +36,7 @@ class ListPost extends BlogPage
 			$this->_category=$this->DataAccess->queryCategoryByID($catID);
 			$this->CategoryPanel->Visible=true;
 		}
+		$this->Title=$this->Application->Parameters['SiteTitle'];
 	}
 
 	private function getPageOffset()
@@ -73,7 +74,7 @@ class ListPost extends BlogPage
 
 	private function getPostFilter()
 	{
-		$filter='a.status=0';
+		$filter='(a.status=0 OR a.status=3)';
 		if(($timeFilter=$this->getTimeFilter())!=='')
 			return "$filter AND $timeFilter";
 		else
-- 
cgit v1.2.3