From: <pk...@us...> - 2010-09-26 15:25:41
|
Revision: 29644 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29644&view=rev Author: pkdille Date: 2010-09-26 15:25:35 +0000 (Sun, 26 Sep 2010) Log Message: ----------- [QT] Quality Team Backport r29575 | nkoth | 2010-09-23 19:18:06 +0200 (Thu, 23 Sep 2010) | 1 line [bp/r29573][bp/r29574][FIX] Prevent ambiguous field database errors on clicking on headings in forum post listing Modified Paths: -------------- branches/5.x/lib/commentslib.php Modified: branches/5.x/lib/commentslib.php =================================================================== --- branches/5.x/lib/commentslib.php 2010-09-26 15:25:13 UTC (rev 29643) +++ branches/5.x/lib/commentslib.php 2010-09-26 15:25:35 UTC (rev 29644) @@ -744,9 +744,22 @@ if ($reply_state == 'none') { $query .= ' HAVING `replies` = 0 '; } - if (strstr($sort_mode, 'commentDate')) { + // Prevent ambiguous field database errors + if (strpos($sort_mode, 'commentDate') !== false) { $sort_mode = str_replace('commentDate', 'a.commentDate', $sort_mode); } + if (strpos($sort_mode, 'hits') !== false) { + $sort_mode = str_replace('hits', 'a.hits', $sort_mode); + } + if (strpos($sort_mode, 'title') !== false) { + $sort_mode = str_replace('title', 'a.title', $sort_mode); + } + if (strpos($sort_mode, 'type') !== false) { + $sort_mode = str_replace('type', 'a.type', $sort_mode); + } + if (strpos($sort_mode, 'userName') !== false) { + $sort_mode = str_replace('userName', 'a.userName', $sort_mode); + } $query .="order by `sticky` desc, ".$this->convertSortMode($sort_mode).", `threadId`"; if( $forumId ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |