Fix fullTablename(), ensure prefix prepending is only skipped when no…

…t on position 0 in tablename. Fixes #2750
cakephp · Apr 4, 2012 · d209882 · d209882
1 parent 77f698d
commit d209882
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -922,7 +922,7 @@ public function fullTableName($model, $quote = true, $schema = true) {
 		if (is_object($model)) {
 			$schemaName = $model->schemaName;
 			$table = $model->tablePrefix . $model->table;
-		} elseif (!empty($this->config['prefix']) && strpos($model, $this->config['prefix']) === false) {
+		} elseif (!empty($this->config['prefix']) && strpos($model, $this->config['prefix']) !== 0) {
 			$table = $this->config['prefix'] . strval($model);
 		} else {
 			$table = strval($model);

diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -746,6 +746,10 @@ public function testFullTablePermutations() {
 		$Article->schemaName = null;
 		$result = $noschema->fullTableName($Article, false, true);
 		$this->assertEquals('articles', $result);
+
+		$this->testDb->config['prefix'] = 't_';
+		$result = $this->testDb->fullTableName('post_tag', false, false);
+		$this->assertEquals('t_post_tag', $result);
 	}
 
 /**