diff options
| -rw-r--r-- | BitBlogPost.php | 8 | ||||
| -rw-r--r-- | modules/mod_last_blog_posts.php | 6 | ||||
| -rw-r--r-- | templates/center_list_blog_posts.php | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/BitBlogPost.php b/BitBlogPost.php index 7c1e19f..b5610d7 100644 --- a/BitBlogPost.php +++ b/BitBlogPost.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.110 2007/12/04 17:59:33 wjames5 Exp $ + * $Header: /cvsroot/bitweaver/_bit_blogs/BitBlogPost.php,v 1.111 2007/12/05 05:06:12 wjames5 Exp $ * * Copyright (c) 2004 bitweaver.org * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: BitBlogPost.php,v 1.110 2007/12/04 17:59:33 wjames5 Exp $ + * $Id: BitBlogPost.php,v 1.111 2007/12/05 05:06:12 wjames5 Exp $ * * Virtual base class (as much as one can have such things in PHP) for all * derived tikiwiki classes that require database access. @@ -16,7 +16,7 @@ * * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com> * - * @version $Revision: 1.110 $ $Date: 2007/12/04 17:59:33 $ $Author: wjames5 $ + * @version $Revision: 1.111 $ $Date: 2007/12/05 05:06:12 $ $Author: wjames5 $ */ /** @@ -773,7 +773,7 @@ class BitBlogPost extends LibertyAttachable { $bindVars = array(); array_push( $bindVars, $this->mContentTypeGuid ); - $this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars ); + $this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars, NULL, $pListHash ); if( @$this->verifyId( $pListHash['blog_id'] ) ) { $selectSql .= ', bpm.crosspost_note'; diff --git a/modules/mod_last_blog_posts.php b/modules/mod_last_blog_posts.php index 3713dca..96187fe 100644 --- a/modules/mod_last_blog_posts.php +++ b/modules/mod_last_blog_posts.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_blogs/modules/mod_last_blog_posts.php,v 1.18 2007/11/13 04:29:20 wjames5 Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_blogs/modules/mod_last_blog_posts.php,v 1.19 2007/12/05 05:06:12 wjames5 Exp $ * @package blogs * @subpackage modules */ @@ -20,7 +20,7 @@ if( !empty($module_params['date_start_offset']) ){ $date_start = time() - ( $module_params['date_start_offset'] * 3600 ); } -$listHash = array( +$defaultsHash = array( 'sort_mode' => ( !empty( $module_params['sort_mode'] ) ? $module_params['sort_mode'] : 'publish_date_desc' ), 'max_records' => $module_rows, 'parse_data' => TRUE, @@ -30,6 +30,8 @@ $listHash = array( 'date_start' => $date_start, ); +$listHash = array_merge($module_params, $defaultsHash); + if(( empty( $module_params['include'] ) || $module_params['include'] != 'all' ) && !empty( $gQueryUserId )) { $listHash['user_id'] = $gQueryUserId; } diff --git a/templates/center_list_blog_posts.php b/templates/center_list_blog_posts.php index 726f932..a01f40f 100644 --- a/templates/center_list_blog_posts.php +++ b/templates/center_list_blog_posts.php @@ -1,9 +1,9 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_blogs/templates/center_list_blog_posts.php,v 1.25 2007/11/13 05:02:37 wjames5 Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_blogs/templates/center_list_blog_posts.php,v 1.26 2007/12/05 05:06:12 wjames5 Exp $ * @package bitweaver */ -global $gBitSmarty, $gBlog, $gBitSystem, $gQueryUserId, $moduleParams; +global $gBitSmarty, $gBlog, $gBitSystem, $gQueryUserId, $moduleParams, $gBitUser; if( !empty( $moduleParams ) ) { extract( $moduleParams ); } |