Make sure guest is always manual

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 8c6d438810c3746fc849e746d8c3c6f381f37ef5..22f59e4b9f4de7c3675271cda7338d3b5ad0d2b4 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -761,6 +761,13 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2004052800) {     /// First version tagged "1.4 development", version.php 1.227
+        // Add blockinfo to the site course
+        require_once($CFG->dirroot.'/lib/blocklib.php');
+        $site = get_site();
+        blocks_get_default_blocks($site->id, BLOCK_SITE_DEFAULT);
+    }
+
     if ($oldversion < 2004053000) {     /// set defaults for site course
         $site = get_site();
         set_field('course', 'numsections', 0, 'id', $site->id);
@@ -842,6 +849,10 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2004082900) {  // Make sure guest is "manual" too.
+        set_field('user', 'auth', 'manual', 'username', 'guest');
+    }
+
     return $result;
 
 }

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 146f5fb6b0a2d96530e57db91ea2e7b2792ea0b8..17a9595901db7d146d56c70f98250cf7f42f8460 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -503,6 +503,13 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2004052800) {     /// First version tagged "1.4 development", version.php 1.227
+        // Add blockinfo to the site course
+        require_once($CFG->dirroot.'/lib/blocklib.php');
+        $site = get_site();
+        blocks_get_default_blocks($site->id, BLOCK_SITE_DEFAULT);
+    }
+
     if ($oldversion < 2004053000) {     /// set defaults for site course
         $site = get_site();
         set_field('course', 'numsections', 0, 'id', $site->id);
@@ -576,6 +583,10 @@ function main_upgrade($oldversion=0) {
         }
     }
         
+    if ($oldversion < 2004082900) {  // Make sure guest is "manual" too.
+        set_field('user', 'auth', 'manual', 'username', 'guest');
+    }
+
     return $result;
 
 }