Changing to read Model.field from the start of string.

vitorpacheco · Apr 28, 2010 · 67b2cab · 67b2cab
1 parent ab8d77a
commit 67b2cab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/models/behaviors/super_find.php b/models/behaviors/super_find.php
@@ -31,10 +31,10 @@ function superFind(&$Model, $conditions = null, $fields = array(), $order = null
 				if (is_string($key)) {
 					$check = $key;
 				}
-				if (strpos($check, '.') === false) {
+				if (!preg_match('/^(\w+)\.(\w+)/', $check, $matches)) {
 					continue;
 				}
-				list($modelName, $fieldName) = explode('.', $check, 2);
+				list(, $modelName, $fieldName) = $matches;
 				if ($modelName === $Model->alias || isset($Model->belongsTo[$modelName]) || isset($Model->hasOne[$modelName])) {
 					continue;
 				}

diff --git a/tests/cases/models/behaviors/super_find.test.php b/tests/cases/models/behaviors/super_find.test.php
@@ -213,6 +213,18 @@ function testConditionsOfHABTMAndHasMany() {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * testVarious
+ *
+ * @access public
+ * @return void
+ */
+	function testVarious() {
+		$result = $this->User->superFind('all', array('conditions' => array('name = "User.1"')));
+		$expected = array();
+		$this->assertIdentical($result, $expected);
+	}
 }
 
 ?>