Merged fix for MDL-8803 from 1.8

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 6e6e78292dc518bbb261c57c1603ced17ddf51cb..8b03dcdc4af9a05cfc77fc426566b70f375fae86 100644 (file)
--- 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'));
         }