Merge branch 'master' into develop

Conflicts: README.markdown
tag · Nov 29, 2012 · 7f38e9c · 7f38e9c
2 parents ceb24a8 + 2237d73
commit 7f38e9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -31,6 +31,14 @@ Changelog
 * Add query logging to `delete_many` [[tag](https://github.com/tag)]
 * Add `is_new` method - closes issue #85
 
+#### 1.2.3 - release 2012-11-28
+
+* Fix issue #78 - remove use of PHP 5.3 static call
+
+#### 1.2.2 - release 2012-11-15
+
+* Fix bug where input parameters were sent as part-indexed, part associative
+
 #### 1.2.1 - release 2012-11-15
 
 * Fix minor bug caused by IdiormStringException not extending Exception

diff --git a/idiorm.php b/idiorm.php
@@ -1302,7 +1302,7 @@ public function save() {
             $query = array();
 
             // remove any expression fields as they are already baked into the query
-            $values = array_diff_key($this->_dirty_fields, $this->_expr_fields);
+            $values = array_values(array_diff_key($this->_dirty_fields, $this->_expr_fields));
 
             if (!$this->_is_new) { // UPDATE
                 // If there are no dirty values, do nothing
@@ -1453,7 +1453,7 @@ public static function value($subject) {
          * @return string
          */
         public static function str_replace_outside_quotes($search, $replace, $subject) {
-            return static::value($subject)->replace_outside_quotes($search, $replace);
+            return self::value($subject)->replace_outside_quotes($search, $replace);
         }
 
         /**