Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix more uses of Set -> Hash

  • Loading branch information...
commit a76a926ac13039bb5b5a846c2bc56d9f83a545b6 1 parent 9015d78
@markstory markstory authored
Showing with 4 additions and 3 deletions.
  1. +2 −2 lib/Cake/Model/Model.php
  2. +2 −1  lib/Cake/View/Helper/FormHelper.php
View
4 lib/Cake/Model/Model.php
@@ -22,7 +22,7 @@
App::uses('ClassRegistry', 'Utility');
App::uses('Validation', 'Utility');
App::uses('String', 'Utility');
-App::uses('Set', 'Utility');
+App::uses('Hash', 'Utility');
App::uses('BehaviorCollection', 'Model');
App::uses('ModelBehavior', 'Model');
App::uses('ConnectionManager', 'Model');
@@ -2873,7 +2873,7 @@ protected function _findNeighbors($state, $query, $results = array()) {
unset($query['conditions'][$field . ' <']);
$return = array();
if (isset($results[0])) {
- $prevVal = Set::extract('/' . str_replace('.', '/', $field), $results[0]);
+ $prevVal = Hash::get($results[0], $field);
$query['conditions'][$field . ' >='] = $prevVal[0];
$query['conditions'][$field . ' !='] = $value;
$query['limit'] = 2;
View
3  lib/Cake/View/Helper/FormHelper.php
@@ -14,6 +14,7 @@
*/
App::uses('AppHelper', 'View/Helper');
+App::uses('Hash', 'Utility');
/**
* Form helper library.
@@ -965,7 +966,7 @@ public function inputs($fields = null, $blacklist = null) {
public function input($fieldName, $options = array()) {
$this->setEntity($fieldName);
- $options = Set::merge(
+ $options = Hash::merge(
array('before' => null, 'between' => null, 'after' => null, 'format' => null),
$this->_inputDefaults,
$options
Please sign in to comment.
Something went wrong with that request. Please try again.