Merged block upgrade fix from stable

2004-08-30 16:26:00 +00:00
parent 3c6427126b
commit e02c35b2ae
5 changed files with 18 additions and 17 deletions
@@ -504,10 +504,7 @@ 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);
+        set_config('siteblocksadded', true);   /// This will be used later by the block upgrade
    }

    if ($oldversion < 2004053000) {     /// set defaults for site course