Change GetList to return the list rather than a hash as per the other BW4 packages

2 files changed, 16 insertions, 14 deletions

diff --git a/BitBlogPost.php b/BitBlogPost.php
index 0ffcb3f..8cd98e7 100644
--- a/BitBlogPost.php
+++ b/BitBlogPost.php
@@ -2,21 +2,19 @@
 /**
  * $Header$
  *
- * Copyright (c) 2004 bitweaver.org
+ * @copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id$
- *
  * Virtual base class (as much as one can have such things in PHP) for all
  * derived tikiwiki classes that require database access.
- * @package blogs
  *
- * created 2004/10/20
+ * @date created 2004/10/20
  *
  * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com>
  *
  * @version $Revision$
+ * @package blogs
  */
 
 /**
@@ -149,6 +147,14 @@ class BitBlogPost extends LibertyMime {
 		return( count( $this->mInfo ) );
 	}
 
+	function getTitle( $pHash = NULL, $pDefault = true ) {
+		$ret = NULL;
+		if( $this->isValid() ) {
+			$ret = self::getTitleFromHash( $this->mInfo );
+		}
+		return $ret;
+	}
+
 	public static function getTitleFromHash( $pHash, $pDefault=TRUE ) {
 		global $gBitSystem;
 		$ret = NULL;
@@ -693,7 +699,7 @@ class BitBlogPost extends LibertyMime {
 
 		$ret = $pTitle;
 		if( $gBitSystem->isPackageActive( 'blogs' ) ) {
-			$ret = '<a title="'.htmlspecialchars( BitBlogPost::getTitleFromHash( $pMixed ) ).'" href="'.BitBlogPost::getDisplayUrlFromHash( $pMixed['content_id'] ).'">'.htmlspecialchars( BitBlogPost::getTitleFromHash( $pMixed  ) ).'</a>';
+			$ret = '<a title="'.htmlspecialchars( BitBlogPost::getTitle( $pMixed ) ).'" href="'.BitBlogPost::getDisplayUrlFromHash( $pMixed['content_id'] ).'">'.htmlspecialchars( BitBlogPost::getTitle( $pMixed  ) ).'</a>';
 		}
 
 		return $ret;
@@ -924,7 +930,6 @@ class BitBlogPost extends LibertyMime {
 				INNER JOIN		`".BIT_DB_PREFIX."users_users`			 uu ON uu.`user_id`			   = lc.`user_id`
 				$joinSql
 			WHERE lc.`content_type_guid` = ? $whereSql ";
-
 		$cant = $this->mDb->getOne($query_cant,$bindVars);
 		$pListHash["cant"] = $cant;
 
@@ -1017,12 +1022,9 @@ class BitBlogPost extends LibertyMime {
 			} else {
 			}
 		}
-
-		$pListHash["data"] = $ret;
-
 		LibertyContent::postGetList( $pListHash );
 
-		return $pListHash;
+		return $ret;
 	}
 
 	/**
diff --git a/display_bitblog_inc.php b/display_bitblog_inc.php
index fe07f20..2d4ef7b 100644
--- a/display_bitblog_inc.php
+++ b/display_bitblog_inc.php
@@ -57,10 +57,10 @@ $listHash['parse_data'] = TRUE;
 $listHash['max_records'] = $gContent->getField( 'max_posts' );
 $listHash['load_num_comments'] = TRUE;
 $blogPosts = $blogPost->getList( $listHash );
-if( count( $blogPosts['data'] ) ) {
+if( count( $blogPosts ) ) {
 	// If there're more records then assign next_offset
-	$gBitSmarty->assign_by_ref('blogPosts', $blogPosts["data"]);
-	$gBitSmarty->assign( 'listInfo', $blogPosts['listInfo'] );
+	$gBitSmarty->assign_by_ref('blogPosts', $blogPosts);
+	$gBitSmarty->assign( 'listInfo', $listInfo );
 } elseif( $gContent->hasPostPermission() ) {
 	bit_redirect( BLOGS_PKG_URL.'post.php?blog_id='.$gContent->getField( 'blog_id' ) );
 }