diff --git a/core/class/class_db_pdo.php b/core/class/class_db_pdo.php
index e4eff814964b8f7e0fbf864cce0f025f2668c1c6..5208171c977f0a0f6f0e081e06ddacadd8d4f85d 100755
--- a/core/class/class_db_pdo.php
+++ b/core/class/class_db_pdo.php
@@ -439,18 +439,15 @@ class Database extends functions
                 ' ' . $other_clauses .
                 ' ' . $limit_clause .
                 ' ' . $order_by;*/
-            if ($other_clauses <> '') {
-                $other_clauses = ' WHERE ' . $other_clauses;
-            }
             $query = 'SELECT * FROM (SELECT' . 
                 ' ' . $select_opts . 
                 ' ' . $select_expr . 
                 ' FROM ' . $table_refs .
-                ' ' .
+                ' WHERE ' . $where_def .
                 ' ' . $other_clauses .
-                ' ' . $limit_clause .
+                // ' ' . $limit_clause .
                 ' ' . $order_by .
-                ') WHERE ' . $where_def;
+                ') WHERE ' . $limit_clause;
         } else {
             $query = 'SELECT' . 
                 ' ' . $select_opts .