Checking in a fix for the blocks upgrade on the home page so I can test
it on upgrading a real site.
This commit is contained in:
@@ -37,6 +37,13 @@ global $CFG;
|
||||
COMMENT = 'To register and update all the available blocks'");
|
||||
}
|
||||
|
||||
if (!empty($CFG->siteblocksadded)) { /// Set by main Moodle upgrade
|
||||
// Add blockinfo to the site course
|
||||
require_once($CFG->dirroot.'/lib/blocklib.php');
|
||||
$site = get_site();
|
||||
blocks_get_default_blocks($site->id, BLOCKS_DEFAULT_SITE);
|
||||
}
|
||||
|
||||
//Finally, return result
|
||||
return $result;
|
||||
}
|
||||
|
||||
@@ -39,6 +39,13 @@ global $CFG;
|
||||
|
||||
}
|
||||
|
||||
if (!empty($CFG->siteblocksadded)) { /// Set by main Moodle upgrade
|
||||
// Add blockinfo to the site course
|
||||
require_once($CFG->dirroot.'/lib/blocklib.php');
|
||||
$site = get_site();
|
||||
blocks_get_default_blocks($site->id, BLOCKS_DEFAULT_SITE);
|
||||
}
|
||||
|
||||
//Finally, return result
|
||||
return $result;
|
||||
}
|
||||
|
||||
+1
-4
@@ -762,10 +762,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, BLOCKS_DEFAULT_SITE);
|
||||
$CFG->siteblocksadded = true; /// This will be used later by the block upgrade
|
||||
}
|
||||
|
||||
if ($oldversion < 2004053000) { /// set defaults for site course
|
||||
|
||||
@@ -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, BLOCKS_DEFAULT_SITE);
|
||||
$CFG->siteblocksadded = true; /// This will be used later by the block upgrade
|
||||
}
|
||||
|
||||
if ($oldversion < 2004053000) { /// set defaults for site course
|
||||
|
||||
Reference in New Issue
Block a user