refs #1067 : modified - blog.notice (finished.)

Needlworks · Jan 28, 2015 · f295dcb · f295dcb
1 parent 462782e
commit f295dcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/library/model/blog.locative.php b/library/model/blog.locative.php
@@ -4,6 +4,7 @@
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function getLocatives($blogid) {
+	//TODO Fix the parameter. Current code does not work. DBModel upgrade needed for complex queries.
 	return getEntries($blogid, 'id, userid, title, slogan, location', array(array('length(location)','>',1),'AND',array('category','>',-1)), 'location');
 }
 

diff --git a/library/model/blog.notice.php b/library/model/blog.notice.php
@@ -4,15 +4,15 @@
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function getNoticesWithPaging($blogid, $search, $page, $count) {
-	global $database, $folderURL, $suri;
-	$aux = '';
+	$context = Model_Context::getInstance();
+	$pool = getDefaultDBModelOnNotice($blogid);
+
 	if (($search !== true) && $search) {
 		$search = escapeSearchString($search);
-		$aux = "AND (title LIKE '%$search%' OR content LIKE '%$search%')";
+		$pool->setQualifierSet(array("title","like",$search,true),"OR",array("content","like",$search,true));
 	}
-	$visibility = doesHaveOwnership() ? '' : 'AND visibility > 1';
-	$sql = "SELECT * FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -2 $aux ORDER BY published DESC";
-	return Paging::fetch($sql, $page, $count, "$folderURL/{$suri['value']}");
+
+	return Paging::fetch($pool, $page, $count, $context->getProperty("uri.folder")."/".$context->getProperty("suri.value"));
 }
 
 function getNotice($blogid, $id) {