Merge branch 'MDL-38500-24' of git://github.com/FMCorz/moodle into MO…

…ODLE_24_STABLE
moodle · May 7, 2013 · b15eea6 · b15eea6
2 parents 1df3b0a + 7b6ed67
commit b15eea6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/repository/lib.php b/repository/lib.php
@@ -2698,8 +2698,9 @@ public function validation($data, $files) {
 
         $sql = "SELECT count('x')
                   FROM {repository_instances} i, {repository} r
-                 WHERE r.type=:plugin AND r.id=i.typeid AND i.name=:name";
-        if ($DB->count_records_sql($sql, array('name' => $data['name'], 'plugin' => $data['plugin'])) > 1) {
+                 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 ($DB->count_records_sql($sql, $params) > 0) {
             $errors['name'] = get_string('erroruniquename', 'repository');
         }