[geeklog-cvs] geeklog: Fixed SQL error with certain search strings

[geeklog-cvs at lists.geeklog.net]

changeset 7949:c31d64f479d7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c31d64f479d7
user: Sami Barakat <sami at sbarakat.co.uk>
date: Mon May 31 23:10:32 2010 +0100
description:
Fixed SQL error with certain search strings

diffstat:

 system/classes/listfactory.class.php |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 617729a5d101 -r c31d64f479d7 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Mon May 31 23:04:10 2010 +0100
+++ b/system/classes/listfactory.class.php	Mon May 31 23:10:32 2010 +0100
@@ -336,14 +336,12 @@
         }
 
         if (is_array($sql)) {
-            $sql['mysql'] = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql['mysql']);
-            $sql['mssql'] = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql['mssql']);
-            $sql['pgsql'] = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql['pgsql']);
-
-            
+            $sql['mysql'] = preg_replace('/SELECT.*?FROM/is', 'SELECT COUNT(*) FROM', $sql['mysql']);
+            $sql['mssql'] = preg_replace('/SELECT.*?FROM/is', 'SELECT COUNT(*) FROM', $sql['mssql']);
+            $sql['pgsql'] = preg_replace('/SELECT.*?FROM/is', 'SELECT COUNT(*) FROM', $sql['pgsql']);
         }
         else {
-            $sql = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql);
+            $sql = preg_replace('/SELECT.*?FROM/is', 'SELECT COUNT(*) FROM', $sql);
         }
         $result = DB_query($sql);
         $num_rows = DB_numRows($result);