Permalink
Browse files

Port over Set to Hash usage.

  • Loading branch information...
markstory committed Mar 12, 2012
1 parent 0ef9adb commit 17bfbbb9df09594a5fee5500dadeaa17182fc57e
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/Cake/I18n/I18n.php
  2. +1 −1 lib/Cake/Model/Datasource/DboSource.php
View
@@ -385,7 +385,7 @@ protected function _bindTextDomain($domain) {
$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]);
@@ -1354,7 +1354,7 @@ protected function _mergeHasMany(&$resultSet, $merge, $association, $model, $lin
}
}
}
- $result = Set::pushDiff($result, array($association => $merged));
+ $result = Hash::mergeDiff($result, array($association => $merged));
}
}

0 comments on commit 17bfbbb

Please sign in to comment.