From 53647f2b3aa759529d62bc86b1e9834f5727ba76 Mon Sep 17 00:00:00 2001 From: Max Kremmel Date: Sat, 9 Sep 2006 05:59:21 +0000 Subject: rename filter hash key to $pParamHash['pigeonholes']['filter'] - not sure if this is the best way to do this, but we'll see. --- Pigeonholes.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Pigeonholes.php') diff --git a/Pigeonholes.php b/Pigeonholes.php index 1ce6c78..80b1efd 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ - * @version $Revision: 1.69 $ + * @version $Revision: 1.70 $ * @package pigeonholes */ @@ -996,15 +996,15 @@ function pigeonholes_content_store( $pObject, $pParamHash ) { function pigeonholes_content_list_sql( &$pObject, $pParamHash = NULL ) { global $gBitSystem; $ret = array(); - if( /*$gBitSystem->isFeatureActive( 'pigeonholes_categorize_'.$pObject->getContentType() ) && */ !empty( $pParamHash['category_filter'] ) ) { - if ( is_array( $pParamHash['category_filter'] ) ) { + if( /*$gBitSystem->isFeatureActive( 'pigeonholes_categorize_'.$pObject->getContentType() ) && */ !empty( $pParamHash['pigeonholes']['filter'] ) ) { + if ( is_array( $pParamHash['pigeonholes']['filter'] ) ) { $ret['join_sql'] = "LEFT JOIN `".BIT_DB_PREFIX."pigeonhole_members` pm ON (lc .`content_id`= pm.`content_id`)"; - $ret['where_sql'] = ' AND pm.`parent_id` in ('.implode( ',', array_fill(0, count( $pParamHash['category_filter'] ), '?' ) ).')'; - $ret['bind_vars'] = $pParamHash['category_filter']; + $ret['where_sql'] = ' AND pm.`parent_id` in ('.implode( ',', array_fill(0, count( $pParamHash['pigeonholes']['filter'] ), '?' ) ).')'; + $ret['bind_vars'] = $pParamHash['pigeonholes']['filter']; } else { $ret['join_sql'] = "LEFT JOIN `".BIT_DB_PREFIX."pigeonhole_members` pm ON (lc .`content_id`= pm.`content_id`)"; $ret['where_sql'] = " AND pm.`parent_id`=? "; - $ret['bind_vars'][] = $pParamHash['category_filter']; + $ret['bind_vars'][] = $pParamHash['pigeonholes']['filter']; } } return $ret; -- cgit v1.3