From: moodler <moodler>
Date: Fri, 9 Mar 2007 05:04:53 +0000 (+0000)
Subject: Merged fix for MDL-8803 from 1.8
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b7791fab19632933cf67c687eedbc8e39b816c41;p=moodle.git

Merged fix for MDL-8803 from 1.8
---

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 6e6e78292d..8b03dcdc4a 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -339,8 +339,7 @@ function xmldb_main_upgrade($oldversion=0) {
         $index->setFields(array('username'));
         drop_index($table, $index);
         $index->setFields(array('mnethostid', 'username'));
-        $empty_on_duplicate = add_index($table, $index);
-        if(empty($fail_on_duplicate)) {
+        if (!add_index($table, $index)) {
             notify(get_string('duplicate_usernames', 'mnet', 'http://docs.moodle.org/en/DuplicateUsernames'));
         }