Browse Source

...

tags/2.0.0-beta
Qiang Xue 13 years ago
parent
commit
b3460fc30e
  1. 2
      framework/db/ar/ActiveFinder.php
  2. 2
      framework/db/ar/ActiveRecord.php
  3. 2
      framework/util/ArrayHelper.php

2
framework/db/ar/ActiveFinder.php

@ -300,7 +300,7 @@ class ActiveFinder extends \yii\base\Object
} }
if ($config instanceof \Closure) { if ($config instanceof \Closure) {
call_user_func($config, $child->query); $config($child->query);
} else { } else {
foreach ($config as $name => $value) { foreach ($config as $name => $value) {
$child->query->$name = $value; $child->query->$name = $value;

2
framework/db/ar/ActiveRecord.php

@ -574,7 +574,7 @@ abstract class ActiveRecord extends Model
} }
$relation = clone $relation; $relation = clone $relation;
if ($params instanceof \Closure) { if ($params instanceof \Closure) {
call_user_func($params, $relation); $params($relation);
} else { } else {
foreach ($params as $name => $value) { foreach ($params as $name => $value) {
$relation->$name = $value; $relation->$name = $value;

2
framework/util/ArrayHelper.php

@ -77,7 +77,7 @@ class ArrayHelper
public static function get($array, $key, $default = null) public static function get($array, $key, $default = null)
{ {
if ($key instanceof \Closure) { if ($key instanceof \Closure) {
return call_user_func($key, $array, $default); return $key($array, $default);
} elseif (is_array($array)) { } elseif (is_array($array)) {
return isset($array[$key]) || array_key_exists($key, $array) ? $array[$key] : $default; return isset($array[$key]) || array_key_exists($key, $array) ? $array[$key] : $default;
} else { } else {

Loading…
Cancel
Save