php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-27 04:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed broken UniqueValidator

Browse Source
This commit is contained in:
Carsten Brandt
2013-11-22 19:20:46 +01:00
parent 6995e8ddd0
commit ed98df5cd8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/validators/UniqueValidator.php
View File

@@ -65,12 +65,12 @@ class UniqueValidator extends Validator
$attributeName = $this->attributeName === null ? $attribute : $this->attributeName; $attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
$attributes = $className::attributes(); $attributes = $className::attributes();
if (!in_array($attribute, $attributes)) { if (!in_array($attributeName, $attributes)) {
throw new InvalidConfigException("'$className' does not have an attribute named '$attributeName'."); throw new InvalidConfigException("'$className' does not have an attribute named '$attributeName'.");
} }
$query = $className::find(); $query = $className::find();
$query->where([$attribute => $value]); $query->where([$attributeName => $value]);
if (!$object instanceof ActiveRecord || $object->getIsNewRecord()) { if (!$object instanceof ActiveRecord || $object->getIsNewRecord()) {
// if current $object isn't in the database yet then it's OK just to call exists() // if current $object isn't in the database yet then it's OK just to call exists()
@@ -82,7 +82,7 @@ class UniqueValidator extends Validator
$n = count($objects); $n = count($objects);
if ($n === 1) { if ($n === 1) {
if (in_array($attribute, $className::primaryKey())) { if (in_array($attributeName, $className::primaryKey())) {
// primary key is modified and not unique // primary key is modified and not unique
$exists = $object->getOldPrimaryKey() != $object->getPrimaryKey(); $exists = $object->getOldPrimaryKey() != $object->getPrimaryKey();
} else { } else {