From: Petr Skoda <skodak@moodle.org>
Date: Tue, 24 Nov 2009 15:02:24 +0000 (+0000)
Subject: MDL-20948 warn admin is main salt not set
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=57e6ce5eebf8deb7445e3d5b4be7cf487b97f8d4;p=moodle.git

MDL-20948 warn admin is main salt not set
---

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 341424d4e0..f2671bb93f 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2826,6 +2826,14 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         upgrade_main_savepoint($result, 2009111702);
     }
 
+    if ($result && $oldversion < 2009112400) {
+        if (empty($CFG->passwordsaltmain)) {
+            $subject = get_string('check_passwordsaltmain_name', 'report_security');
+            $description = get_string('check_passwordsaltmain_warning', 'report_security');;
+            upgrade_log(UPGRADE_LOG_NOTICE, null, $subject, $description);
+        }
+        upgrade_main_savepoint($result, 2009112400);
+    }
 
     return $result;
 }
diff --git a/version.php b/version.php
index f0f3f08a46..b177b07a7c 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2009112000;  // YYYYMMDD   = date of the last version bump
+    $version = 2009112400;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20091124)';  // Human-friendly version name