adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port over Set to Hash usage.

Browse source
This commit is contained in:
mark_story 2012-03-11 22:57:54 -04:00
parent 0ef9adba93
commit 17bfbbb9df
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/I18n/I18n.php
View file

@ -385,7 +385,7 @@ class I18n {
$this->_domains[$domain][$this->_lang][$this->category]["%plural-c"] = $switch;
unset($this->_domains[$domain][$this->_lang][$this->category]["%po-header"]);
}
$this->_domains = Set::pushDiff($this->_domains, $merge);
$this->_domains = Hash::mergeDiff($this->_domains, $merge);
if (isset($this->_domains[$domain][$this->_lang][$this->category][null])) {
unset($this->_domains[$domain][$this->_lang][$this->category][null]);

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1354,7 +1354,7 @@ class DboSource extends DataSource {
}
}
}
$result = Set::pushDiff($result, array($association => $merged));
$result = Hash::mergeDiff($result, array($association => $merged));
}
}