L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-19124 Reimplementing the My Moodle default blocks for upgraded sites, to match new installs

Browse Source
This commit is contained in:
Martin Dougiamas
2010-05-04 16:17:41 +00:00
parent 7227d8391b
commit 0184a3fd45
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+1 -1
View File
@@ -1785,5 +1785,5 @@ function blocks_add_default_system_blocks() {
$subpagepattern = null;
}
$page->blocks->add_blocks(array(BLOCK_POS_RIGHT => array('myprofile', 'private_files', 'online_users'), 'content' => array('course_overview')), 'my-index', $subpagepattern, false);
$page->blocks->add_blocks(array(BLOCK_POS_RIGHT => array('private_files', 'online_users'), 'content' => array('course_overview')), 'my-index', $subpagepattern, false);
}
lib/db/upgrade.php
+39 -3
View File
@@ -3928,7 +3928,7 @@ AND EXISTS (SELECT 'x'
}
if ($result && $oldversion < 2010050402) { // my_pages for My Moodle and Public Profile pages
if ($result && $oldversion < 2010050403) { // my_pages for My Moodle and Public Profile pages
/// Define table my_pages to be created
$table = new xmldb_table('my_pages');
@@ -3952,7 +3952,7 @@ AND EXISTS (SELECT 'x'
$dbman->create_table($table);
}
/// Add two lines of data into this new table
/// Add two lines of data into this new table. These are the default pages.
$mypage = new object();
$mypage->userid = NULL;
$mypage->name = '__default';
@@ -3965,9 +3965,45 @@ AND EXISTS (SELECT 'x'
if (!$DB->record_exists('my_pages', array('userid'=>NULL, 'private'=>1))) {
$result = $result && $DB->insert_record('my_pages', $mypage);
}
/// This bit is a "illegal" hack, unfortunately, but there is not a better way to install default
/// blocks right now, since the upgrade function need to be called after core AND plugins upgrade,
/// and there is no such hook yet. Sigh.
if ($mypage = $DB->get_record('my_pages', array('userid'=>NULL, 'private'=>1))) {
if (!$DB->record_exists('block_instances', array('pagetypepattern'=>'my-index', 'parentcontextid'=>SITEID, 'subpagepattern'=>$mypage->id))) {
// No default exist there yet, let's put a few into My Moodle so it's useful.
$blockinstance = new stdClass;
$blockinstance->parentcontextid = SITEID;
$blockinstance->showinsubcontexts = 0;
$blockinstance->pagetypepattern = 'my-index';
$blockinstance->subpagepattern = $mypage->id;
$blockinstance->configdata = '';
$blockinstance->blockname = 'private_files';
$blockinstance->defaultregion = 'side-post';
$blockinstance->defaultweight = 0;
$blockinstanceid = $DB->insert_record('block_instances', $blockinstance);
get_context_instance(CONTEXT_BLOCK, $blockinstanceid);
$blockinstance->blockname = 'online_users';
$blockinstance->defaultregion = 'side-post';
$blockinstance->defaultweight = 1;
$blockinstanceid = $DB->insert_record('block_instances', $blockinstance);
get_context_instance(CONTEXT_BLOCK, $blockinstanceid);
$blockinstance->blockname = 'course_overview';
$blockinstance->defaultregion = 'content';
$blockinstance->defaultweight = 0;
$blockinstanceid = $DB->insert_record('block_instances', $blockinstance);
get_context_instance(CONTEXT_BLOCK, $blockinstanceid);
}
}
/// Main savepoint reached
upgrade_main_savepoint($result, 2010050402);
upgrade_main_savepoint($result, 2010050403);
}
version.php
+1 -1
View File
@@ -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 = 2010050402; // YYYYMMDD = date of the last version bump
$version = 2010050403; // YYYYMMDD = date of the last version bump
// XX = daily increments
$release = '2.0 dev (Build: 20100504)'; // Human-friendly version name