From: <nk...@us...> - 2010-02-17 17:20:58
|
Revision: 25319 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=25319&view=rev Author: nkoth Date: 2010-02-17 17:20:46 +0000 (Wed, 17 Feb 2010) Log Message: ----------- [FIX] related to [ENH] Add ability to filter files returned by specific creator user , fixing the wrong order of varas being bound to query Modified Paths: -------------- trunk/lib/tikilib.php Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2010-02-17 17:18:34 UTC (rev 25318) +++ trunk/lib/tikilib.php 2010-02-17 17:20:46 UTC (rev 25319) @@ -2292,24 +2292,23 @@ $mid = ' (upper(tab.`name`) LIKE upper(?) OR upper(tab.`description`) LIKE upper(?) OR upper(tab.`filename`) LIKE upper(?))'; $midvars = array($findesc, $findesc, $findesc); } - + if ( $creator ) { + $f_query .= ' AND tf.`user` = ? '; + $bindvars[] = $creator; + } $galleryId_str = ''; if ( is_array($galleryId) ) { $galleryId_str = ' in ('.implode(',', array_fill(0, count($galleryId),'?')).')'; - $bindvars = array_merge($galleryId, $bindvars); + $bindvars = array_merge($bindvars, $galleryId); } elseif ( $galleryId >= -1 ) { $galleryId_str = '=?'; - if ( $with_subgals ) array_unshift($bindvars, $galleryId); - if ( $with_files ) array_unshift($bindvars, $galleryId); + if ( $with_files ) $bindvars[] = $galleryId; + if ( $with_subgals ) $bindvars[] = $galleryId; } if ( $galleryId_str != '' ) { $f_query .= ' AND tf.`galleryId`'.$galleryId_str; } - if ( $creator ) { - $f_query .= ' AND tf.`user` = ? '; - $bindvars[] = $creator; - } - + if ( $with_subgals ) { $g_mid = ''; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |