Fixing error in String::insert where string that contained a question…

… mark were not propperly replaced
cakephp · Oct 13, 2009 · 6dbb869 · 6dbb869
1 parent 24c82e7
commit 6dbb869
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cake/libs/string.php b/cake/libs/string.php
@@ -236,7 +236,7 @@ function insert($str, $data, $options = array()) {
 			);
 		}
 
-		if (strpos($str, '?') !== false) {
+		if (strpos($str, '?') !== false && is_numeric(key($data))) {
 			$offset = 0;
 			while (($pos = strpos($str, '?', $offset)) !== false) {
 				$val = array_shift($data);

diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
@@ -279,6 +279,13 @@ function testTokenize() {
 		$expected = array('tagA', '"single tag"', 'tagB');
 		$this->assertEqual($expected, $result);
 	}
+
+	function testReplaceWithQuestionMarkInString() {
+		$string = ':a, :b and :c?';
+		$expected = '2 and 3?';
+		$result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEqual($expected, $result);
+	}
 }
 
 ?>