Adding return statement, preventing infinite loops when no default fi…

…elds are bound, and unbindTranslation() is called with no fields. Fixes #307
cakephp · Feb 12, 2010 · 0ce14ce · 0ce14ce
1 parent 0611f1b
commit 0ce14ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
@@ -465,6 +465,9 @@ function bindTranslation(&$model, $fields, $reset = true) {
  * @return bool
  */
 	function unbindTranslation(&$model, $fields = null) {
+		if (empty($fields) && empty($this->settings[$model->alias])) {
+			return false;
+		}
 		if (empty($fields)) {
 			return $this->unbindTranslation($model, $this->settings[$model->alias]);
 		}

diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -877,5 +877,23 @@ function testTranslateTableWithPrefix() {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * Test infinite loops not occuring with unbindTranslation()
+ *
+ * @return void
+ */
+	function testUnbindTranslationInfinteLoop() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->Behaviors->detach('Translate');
+		$TestModel->actsAs = array();
+		$TestModel->Behaviors->attach('Translate');
+		$TestModel->bindTranslation(array('title', 'content'), true);
+		$result = $TestModel->unbindTranslation();
+
+		$this->assertFalse($result);
+	}
 }
 ?>