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

MDL-30340 Block stickiness computation improvements

Browse Source 
This is an attempt to clean up and fix the computation of the block
stickiness. At first, the page pattern can't be ignored because the user
may want to currently try to limit the page pattern. Second, the
site-index pattern can be forced only if the user selected 'Front page
only' as the page context.
This commit is contained in:
David Mudrak
2011-12-03 16:57:21 +01:00
committed by Eloy Lafuente (stronk7)
parent e3cdf40ff5
commit 9d2c424d83
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+11 -5
View File
@@ -1235,20 +1235,26 @@ class block_manager {
// Explicitly set the context
$bi->parentcontextid = $parentcontext->id;
// If the context type is > 0 then we'll explicitly set the block as sticky, otherwise not
$bi->showinsubcontexts = (int)(!empty($data->bui_contexts));
// Should the block be sticky
if ($data->bui_contexts == BUI_CONTEXTS_ENTIRE_SITE or $data->bui_contexts == BUI_CONTEXTS_FRONTPAGE_SUBS) {
$bi->showinsubcontexts = true;
} else {
$bi->showinsubcontexts = false;
}
// If the block wants to be system-wide, then explicitly set that
if ($data->bui_contexts == BUI_CONTEXTS_ENTIRE_SITE) { // Only possible on a frontpage or system page
$bi->parentcontextid = $systemcontext->id;
$bi->showinsubcontexts = BUI_CONTEXTS_CURRENT_SUBS; //show in current and sub contexts
$bi->pagetypepattern = '*';
} else { // The block doesn't want to be system-wide, so let's ensure that
if ($parentcontext->id == $systemcontext->id) { // We need to move it to the front page
$frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
$bi->parentcontextid = $frontpagecontext->id;
$bi->pagetypepattern = 'site-index';
if ($data->bui_contexts == BUI_CONTEXTS_FRONTPAGE_ONLY) {
// If the front page only is specified, the page type setting is ignored
// as explicitely set to site-index
$bi->pagetypepattern = 'site-index';
}
}
}
}