adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 03:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/1.2' into 1.3

Browse source 
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
This commit is contained in:
Mark Story 2010-03-27 11:48:49 -04:00
commit 0c29fd0094
4 changed files with 130 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/model.php
View file

@ -2688,7 +2688,7 @@ class Model extends Overloadable {
$field = $this->primaryKey;
}
$db =& ConnectionManager::getDataSource($this->useDbConfig);
if (strpos($field, $db->name($alias)) === 0) {
if (strpos($field, $db->name($alias) . '.') === 0) {
return $field;
}
return $db->name($alias . '.' . $field);