Changeset 128 for trunk/trax/vendor/trax/active_record.php

Timestamp:

02/05/06 23:31:53 (6 years ago)

Author:

john

Message:

bug fixes for views

Files:

• trunk/trax/vendor/trax/active_record.php (modified) (3 diffs)

trunk/trax/vendor/trax/active_record.php

@@ -539 +539 @@
 
         if(is_array($id)) {
-            return /*$this->*/find_all($conditions, $orderings, $limit, $joins);
+            return $this->find_all($conditions, $orderings, $limit, $joins);
         } else {
             return $this->find_first($conditions, $orderings, $limit, $joins);
@@ -855 +855 @@
     function update_attributes($attributes) {
         foreach($attributes as $field => $value) {
-            # datetime parts check
+            # datetime / date parts check
             if(preg_match('/^\w+\(.*i\)$/i', $field)) {
                 $datetime_key = substr($field, 0, strpos($field, "("));
@@ -910 +910 @@
             $value = $this->check_datetime($key, $value);
             # If the value isn't a function or null quote it.
-            #if(!(preg_match('/^\w+\(.*\)$/U', $value)) && !(strcasecmp($value, 'NULL') == 0)) {
-            #    $value = str_replace("\\\"","\"",$value);
-            #    $value = str_replace("\'","'",$value);
-            #    $value = str_replace("\\\\","\\",$value);
-            #    $return[$key] = "'" . addslashes($value) . "'";
-            #} else {
-            #    $return[$key] = $value;
-            #}
-            $return[$key] = self::$db->quoteSmart($value);
+            if(!(preg_match('/^\w+\(.*\)$/U', $value)) && !(strcasecmp($value, 'NULL') == 0)) {
+                $value = str_replace("\\\"","\"",$value);
+                $value = str_replace("\'","'",$value);
+                $value = str_replace("\\\\","\\",$value);
+                $return[$key] = "'" . addslashes($value) . "'";
+            } else {
+                $return[$key] = $value;
+            }
+            # quoteSmart is quoting the primary key need to fix this
+            # for now just use the above to quote fields
+            # $return[$key] = self::$db->quoteSmart($value);
         }
         return $return;