Browse Source

Better argument name in the ActiveRecord::isOperationAtomic() method.

tags/2.0.0-beta
resurtm 12 years ago
parent
commit
4973838b69
  1. 6
      yii/db/ActiveRecord.php

6
yii/db/ActiveRecord.php

@ -1428,15 +1428,15 @@ class ActiveRecord extends Model
} }
/** /**
* @param string $op possible values are ActiveRecord::INSERT, ActiveRecord::UPDATE and ActiveRecord::DELETE. * @param string $operation possible values are ActiveRecord::INSERT, ActiveRecord::UPDATE and ActiveRecord::DELETE.
* @return boolean whether given operation is atomic. Currently active scenario is taken into account. * @return boolean whether given operation is atomic. Currently active scenario is taken into account.
*/ */
private function isOperationAtomic($op) private function isOperationAtomic($operation)
{ {
$scenario = $this->getScenario(); $scenario = $this->getScenario();
$scenarios = $this->scenarios(); $scenarios = $this->scenarios();
if (isset($scenarios[$scenario], $scenario[$scenario]['atomic']) && is_array($scenarios[$scenario]['atomic'])) { if (isset($scenarios[$scenario], $scenario[$scenario]['atomic']) && is_array($scenarios[$scenario]['atomic'])) {
return in_array($op, $scenarios[$scenario]['atomic']); return in_array($operation, $scenarios[$scenario]['atomic']);
} else { } else {
return false; return false;
} }

Loading…
Cancel
Save