From: luci a. l. d' b. <sf...@gr...> - 2011-06-17 11:13:11
|
hi xen, yes, wrong branch. please re-commit in proposals/6.x luci On 06/17/2011 09:10 AM, Xen wrote: > I meant to submit this to 6.x proposals but from the looks of this > message, I submit to 6.x instead? Sorry, I think I goofed. > > > > > On 06/17/2011 12:05 AM, xe...@us... wrote: >> Revision: 34960 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34960&view=rev >> Author: xen216 >> Date: 2011-06-17 07:05:57 +0000 (Fri, 17 Jun 2011) >> >> Log Message: >> ----------- >> [bp/r34614] [FIX] #3850 fixed sql syntax error when using sort and group parameters together >> >> Modified Paths: >> -------------- >> branches/6.x/lib/wiki-plugins/wikiplugin_userlist.php >> >> Modified: branches/6.x/lib/wiki-plugins/wikiplugin_userlist.php >> =================================================================== >> --- branches/6.x/lib/wiki-plugins/wikiplugin_userlist.php 2011-06-17 03:09:50 UTC (rev 34959) >> +++ branches/6.x/lib/wiki-plugins/wikiplugin_userlist.php 2011-06-17 07:05:57 UTC (rev 34960) >> @@ -116,12 +116,6 @@ >> $mid = '1'; >> $bindvars=array(); >> } >> - if (isset($sort)) { >> - $sort=strtolower($sort); >> - if (($sort=='asc') || ($sort=='desc')) { >> - $mid .= ' ORDER BY `login` '.$sort; >> - } >> - } >> $pre=''; $post=''; >> if (isset($layout)) { >> if ($layout=='table') { >> @@ -135,6 +129,12 @@ >> $mid .= ' and uug.`groupName` = ? and uu.`userId` = uug.`userId`'; >> $bindvars[] = $group; >> } >> + if (isset($sort)) { >> + $sort=strtolower($sort); >> + if (($sort=='asc') || ($sort=='desc')) { >> + $mid .= ' ORDER BY `login` '.$sort; >> + } >> + } >> >> $query = "select `login`, uu.`userId` from `users_users` uu $from where $mid"; >> $result = $tikilib->query($query, $bindvars, $numRows); >> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> EditLive Enterprise is the world's most technically advanced content >> authoring tool. Experience the power of Track Changes, Inline Image >> Editing and ensure content is compliant with Accessibility Checking. >> http://p.sf.net/sfu/ephox-dev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------------ > EditLive Enterprise is the world's most technically advanced content > authoring tool. Experience the power of Track Changes, Inline Image > Editing and ensure content is compliant with Accessibility Checking. > http://p.sf.net/sfu/ephox-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ---------------------------------------- > Freehosting PIPNI - http://www.pipni.cz/ > |