Changeset 281 for trunk/lib

Timestamp:

Oct 12, 2007 6:40:28 AM (17 years ago)

Author:

quinn

Message:

Removed escapeString from the printing of the sort order string. This string should contain raw-sql and quoting it can break things.

Location:

trunk/lib

Files:

• SortOrder.inc.php (modified) (1 diff)
• Validator.inc.php (modified) (1 diff)

trunk/lib/SortOrder.inc.php

@@ -143 +143 @@
 
         if (!empty($this->_columns[mb_strtolower($this->sort_by)][mb_strtolower($this->order)])) {
-            return sprintf(' ORDER BY %s ', $db->escapeString($this->_columns[mb_strtolower($this->sort_by)][mb_strtolower($this->order)]));
+            return sprintf(' ORDER BY %s ', $this->_columns[mb_strtolower($this->sort_by)][mb_strtolower($this->order)]);
         } else {
             $app->logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);

trunk/lib/Validator.inc.php

@@ -206 +206 @@
         $app =& App::getInstance();
         
+        if ('' == trim($val)) {
+            // Don't be too bothered about empty strings.
+            return true;
+        }
+
         $timestamp = strtotime($val);
         // Return values change between php4 and php5.