diff options
| author | Lester Caine <lester@lsces.co.uk> | 2006-02-11 12:28:18 +0000 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2006-02-11 12:28:18 +0000 |
| commit | 01b8a3701bb658880f40868fa5c3231434b52767 (patch) | |
| tree | 1a9bc58860bb1a5f3cbe8eb6af15070da029cf66 /Pigeonholes.php | |
| parent | 65be26f3f0a90e450e2860c38a6cb983765180a3 (diff) | |
| download | pigeonholes-01b8a3701bb658880f40868fa5c3231434b52767.tar.gz pigeonholes-01b8a3701bb658880f40868fa5c3231434b52767.tar.bz2 pigeonholes-01b8a3701bb658880f40868fa5c3231434b52767.zip | |
Strip in-line group_id - still need serviceSql adding (missed some)
Diffstat (limited to 'Pigeonholes.php')
| -rw-r--r-- | Pigeonholes.php | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Pigeonholes.php b/Pigeonholes.php index 5ac563d..63d2a2a 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.44 2006/02/11 12:26:50 lsces Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.45 2006/02/11 12:28:18 lsces Exp $ * * +----------------------------------------------------------------------+ * | Copyright ( c ) 2004, bitweaver.org @@ -17,7 +17,7 @@ * Pigeonholes class * * @author xing <xing@synapse.plus.com> - * @version $Revision: 1.44 $ + * @version $Revision: 1.45 $ * @package pigeonholes */ @@ -184,12 +184,6 @@ class Pigeonholes extends LibertyAttachable { $bindVars[] = $pListHash['content_type']; } - if( !$gBitSystem->isPackageActive( 'gatekeeper' ) ) { - $groups = array_keys($gBitUser->mGroups); - $where .= ( empty( $where ) ? " WHERE " : " AND " )." lc.`group_id` IN ( ".implode( ',',array_fill ( 0, count( $groups ),'?' ) )." )"; - $bindVars = array_merge( $bindVars, $groups ); - } - if( !empty( $pListHash['sort_mode'] ) ) { $where .= " ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] )." "; } else { @@ -349,11 +343,6 @@ class Pigeonholes extends LibertyAttachable { $where .= " UPPER( lc.`title` ) LIKE ? "; $bindVars[] = '%'.strtoupper( $pListHash['find'] ).'%'; } - if( !$gBitSystem->isPackageActive( 'gatekeeper' ) ) { - $groups = array_keys($gBitUser->mGroups); - $where .= ( empty( $where ) ? " WHERE " : " AND " )." lc.`group_id` IN ( ".implode( ',',array_fill ( 0, count( $groups ),'?' ) )." )"; - $bindVars = array_merge( $bindVars, $groups ); - } if( !empty( $pListHash['sort_mode'] ) ) { $order .= " ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] )." "; |