Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Dan Poltawski
2014-04-22 12:35:10 +08:00
+2 -2
View File
@@ -73,13 +73,13 @@ class category_form extends moodleform {
$data = (object)$data;
$duplicate = $DB->record_exists('user_info_category', array('name' => $data->name));
$duplicate = $DB->get_field('user_info_category', 'id', array('name' => $data->name));
// Check the name is unique.
if (!empty($data->id)) { // We are editing an existing record.
$olddata = $DB->get_record('user_info_category', array('id' => $data->id));
// Name has changed, new name in use, new name in use by another record.
$dupfound = (($olddata->name !== $data->name) && $duplicate && ($data->id != $duplicate->id));
$dupfound = (($olddata->name !== $data->name) && $duplicate && ($data->id != $duplicate));
} else { // New profile category.
$dupfound = $duplicate;
}