MDL-20932 user->secret out - merged from 19_STABLE

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 25909933a3489a1664ef910fc89c558a063cbb95..65bfaff73980d366c4c6f4d66519c7ab2c1093f9 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -1370,7 +1370,6 @@
                 fwrite ($bf,full_tag("LASTLOGIN",4,false,$user->lastlogin));
                 fwrite ($bf,full_tag("CURRENTLOGIN",4,false,$user->currentlogin));
                 fwrite ($bf,full_tag("LASTIP",4,false,$user->lastip));
-                fwrite ($bf,full_tag("SECRET",4,false,$user->secret));
                 fwrite ($bf,full_tag("PICTURE",4,false,$user->picture));
                 fwrite ($bf,full_tag("URL",4,false,$user->url));
                 fwrite ($bf,full_tag("DESCRIPTION",4,false,$user->description));

diff --git a/backup/restorelib.php b/backup/restorelib.php
index ef8b85f2bdd832c5df459484c7a853811e93e80b..eccc2fab4abc817eef3e96b6a65bd45826489242 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -6844,9 +6844,6 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                         case "LASTIP":
                             $this->info->tempuser->lastip = $this->getContents();
                             break;
-                        case "SECRET":
-                            $this->info->tempuser->secret = $this->getContents();
-                            break;
                         case "PICTURE":
                             $this->info->tempuser->picture = $this->getContents();
                             break;