Merge branch 'master' into develop

Conflicts:
	README.markdown

2 files changed, 10 insertions, 2 deletions

diff --git a/README.markdown b/README.markdown
index 07d7414..4078f6a 100644
--- 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
index 523e157..23e297c 100644
--- a/idiorm.php
+++ b/idiorm.php
@@ -1302,7 +1302,7 @@
             $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 @@
          * @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);
         }
 
         /**