From: stronk7 <stronk7>
Date: Sat, 28 Aug 2004 17:30:34 +0000 (+0000)
Subject: Added compatibility in user->auth from 1.3 backups...$CFG->auth is used
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f496860a90497b1bab4aeb5cf8959c96d4a93756;p=moodle.git

Added compatibility in user->auth from 1.3 backups...$CFG->auth is used
---

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 7bb74a4b5e..8b2d5ca8ed 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -810,12 +810,14 @@
                     $user->description = restore_decode_absolute_links(addslashes($user->description));
 
                     //We need to analyse the AUTH field to recode it:
+                    //   - if the field isn't set, we are in a pre 1.4 backup and we'll 
+                    //     use $CFG->auth
                     //   - if the destination site has any kind of INTERNAL authentication, 
                     //     then apply it to the new user.
                     //   - if the destination site has any kind of EXTERNAL authentication, 
                     //     then leave the original authentication of the user.
 
-                    if (is_internal_auth($CFG->auth)) {
+                    if ((! isset($user->auth)) || is_internal_auth($CFG->auth)) {
                         $user->auth = $CFG->auth;
                     }