Merge pull request #12 from phoenix-labs/develop

Merge Develop into Master
electricjones · Mar 17, 2015 · fe85b32 · fe85b32
2 parents 9ef948e + 36ab0c0
commit fe85b32
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Phoenix/EloquentMeta/Helpers.php b/src/Phoenix/EloquentMeta/Helpers.php
@@ -16,7 +16,14 @@ public static function maybeDecode($value, $asArray = false)
 
         $decoded = json_decode($value, $asArray);
 
-        return json_last_error() == JSON_ERROR_NONE ? $decoded : $value;
+        if (json_last_error() == JSON_ERROR_NONE){
+            return $decoded;
+        } else {
+            // Reset the JSON error code:
+            json_decode("[]");
+
+            return $value;
+        }
     }
 
     /**