mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39641-master-int' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2013-05-14 15:08:25 +08:00
commit a9dcf2db60
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
repository/lib.php
View File

@ -2845,6 +2845,7 @@ final class repository_instance_form extends moodleform {
$instance = (isset($this->_customdata['instance'])
&& is_subclass_of($this->_customdata['instance'], 'repository'))
? $this->_customdata['instance'] : null;
if (!$instance) {
$errors = repository::static_function($plugin, 'instance_form_validation', $this, $data, $errors);
} else {
@ -2855,6 +2856,10 @@ final class repository_instance_form extends moodleform {
FROM {repository_instances} i, {repository} r
WHERE r.type=:plugin AND r.id=i.typeid AND i.name=:name AND i.contextid=:contextid";
$params = array('name' => $data['name'], 'plugin' => $this->plugin, 'contextid' => $this->contextid);
if ($instance) {
$sql .= ' AND i.id != :instanceid';
$params['instanceid'] = $instance->id;
}
if ($DB->count_records_sql($sql, $params) > 0) {
$errors['name'] = get_string('erroruniquename', 'repository');
}