Merge pull request #2467 from kevinhatry/2.0.0

fix inverted test in Model/setSnapshotData() (issue #2466)
phalcon · May 26, 2014 · 2ca69b4 · 2ca69b4
2 parents d6dbd72 + 4cada75
commit 2ca69b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/phalcon/mvc/model.c b/ext/phalcon/mvc/model.c
@@ -4615,7 +4615,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) {
 	}
 
 
-	if (Z_TYPE_P(data) == IS_ARRAY) {
+	if (Z_TYPE_P(data) != IS_ARRAY) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The snapshot data must be an array", "phalcon/mvc/model.zep", 3617);
 		return;
 	}

diff --git a/phalcon/mvc/model.zep b/phalcon/mvc/model.zep
@@ -3613,7 +3613,7 @@ abstract class Model implements ModelInterface, ResultInterface, InjectionAwareI
 	{
 		var key, value, snapshot, attribute;
 
-		if typeof data == "array" {
+		if typeof data != "array" {
 			throw new Exception("The snapshot data must be an array");
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4615,7 +4615,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { @@
     	}
-    	if (Z_TYPE_P(data) == IS_ARRAY) {
+    	if (Z_TYPE_P(data) != IS_ARRAY) {
     		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The snapshot data must be an array", "phalcon/mvc/model.zep", 3617);
     		return;
     	}
@@ Expand Down @@