[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[25354] trunk/lib/blogs/bloglib.php

[<Jy...@us...>]

Revision: 25354
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=25354&view=rev
Author:   Jyhem
Date:     2010-02-18 18:10:49 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
[FIX] Provide blogTitle for module last_blog_posts when last_blog_posts is called for no perticular blog

Modified Paths:
--------------
    trunk/lib/blogs/bloglib.php

Modified: trunk/lib/blogs/bloglib.php
===================================================================
--- trunk/lib/blogs/bloglib.php	2010-02-18 17:26:52 UTC (rev 25353)
+++ trunk/lib/blogs/bloglib.php	2010-02-18 18:10:49 UTC (rev 25354)
@@ -205,7 +205,7 @@
 		$bindvars = array();
 
 		if ( $blogId > 0 ) {
-			$mid[] = "`blogId`=?";
+			$mid[] = "tbp.`blogId`=?";
 			$bindvars[] = (int)$blogId;
 
 			$blog_data = $this->get_blog($blogId);
@@ -213,6 +213,7 @@
 				$ownsblog = 'y';
 			}
 		}
+		$mid[] = "tbp.blogId = tb.blogId";
 
 		if ( !$allowDrafts ){
 			$mid[] = "`priv`!='y'";
@@ -225,34 +226,34 @@
 			     and ($blog_data["public"] != 'y' || $tiki_p_blog_post != 'y')
 			     and ($blog_data["public"] != 'y' || $ownsblog != 'y') ) {
 				if ( isset($user) ) {
-					$mid[] = "(`priv`!='y' or `user`=?)";
+					$mid[] = "(tbp.`priv`!='y' or tbp.`user`=?)";
 					$bindvars[] = "$user";
 				} else {
-					$mid[] = "`priv`!='y'";
+					$mid[] = "tbp.`priv`!='y'";
 				}
 			}
 		}
 
 		if ( $find ) {
 			$findesc = '%' . $find . '%';
-			$mid[] = "(`data` like ? or `title` like ?)";
+			$mid[] = "(tbp.`data` like ? or tbp.`title` like ?)";
 			$bindvars[] = $findesc;
 			$bindvars[] = $findesc;
 		}
 
 		if ( $date_min ) {
-			$mid[] = "`created`>=?";
+			$mid[] = "tbp.`created`>=?";
 			$bindvars[] = (int)$date_min;
 		}
 		if ( $date_max ) {
-			$mid[] = "`created`<=?";
+			$mid[] = "tbp.`created`<=?";
 			$bindvars[] = (int)$date_max;
 		}
 
 		$mid = empty($mid) ? '' : 'where ' . implode(' and ', $mid);
 
-		$query = "select * from `tiki_blog_posts` $mid order by ".$this->convertSortMode($sort_mode);
-		$query_cant = "select count(*) from `tiki_blog_posts` $mid";
+		$query = "select tbp.*,tb.title as blogTitle from `tiki_blog_posts` as tbp, `tiki_blogs` as tb $mid order by ".$this->convert_sortmode($sort_mode);
+		$query_cant = "select count(*) from `tiki_blog_posts` as tbp, `tiki_blogs` as tb $mid";
 		$result = $this->query($query, $bindvars, $maxRecords, $offset);
 		$cant = $this->getOne($query_cant, $bindvars);
 		$ret = array();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.