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

Replaced instances of ife() with more sutiable alternatives in model.php

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7384 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
TommyO 2008-07-30 16:26:48 +00:00
parent 501437baa0
commit 7c7410bda2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -617,7 +617,7 @@ class Model extends Overloadable {
break;
case 'foreignKey':
$data = ife($type == 'belongsTo', Inflector::underscore($assocKey) . '_id', Inflector::singularize($this->table) . '_id');
$data = (($type == 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)) . '_id';
break;
case 'associationForeignKey':
@ -1777,14 +1777,14 @@ class Model extends Overloadable {
if ($query['callbacks'] === true || $query['callbacks'] === 'before') {
$return = $this->Behaviors->trigger($this, 'beforeFind', array($query), array('break' => true, 'breakOn' => false, 'modParams' => true));
$query = ife(is_array($return), $return, $query);
$query = (is_array($return)) ? $return : $query;
if ($return === false) {
return null;
}
$return = $this->beforeFind($query);
$query = ife(is_array($return), $return, $query);
$query = (is_array($return)) ? $return : $query;
if ($return === false) {
return null;
@ -2206,8 +2206,10 @@ class Model extends Overloadable {
if (!isset($validator['message'])) {
if (is_string($index)) {
$validator['message'] = $index;
} elseif (is_numeric($index) && count($ruleSet) > 1) {
$validator['message'] = $index + 1;
} else {
$validator['message'] = ife(is_numeric($index) && count($ruleSet) > 1, ($index + 1), $message);
$validator['message'] = $message;
}
}
$this->invalidate($fieldName, $validator['message']);