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

Fix more uses of Set -> Hash

Browse source
This commit is contained in:
mark_story 2012-03-13 22:06:20 -04:00
parent 9015d78017
commit a76a926ac1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/Model.php
View file

@ -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 @@ class Model extends Object implements CakeEventListener {
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;

3
lib/Cake/View/Helper/FormHelper.php
View file

@ -14,6 +14,7 @@
*/
App::uses('AppHelper', 'View/Helper');
App::uses('Hash', 'Utility');
/**
* Form helper library.
@ -965,7 +966,7 @@ class FormHelper extends AppHelper {
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