moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-34449 lazy load theme layout otpions

Browse source 
This should allow us to switch page layout on admin pages and elsewhere before $OUTPUT->header() call.
This commit is contained in:
Petr Škoda 2012-07-22 15:26:15 +02:00
parent 9592f5dea8
commit 1c005cbf12
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pagelib.php
View file

@ -186,7 +186,7 @@ class moodle_page {
* @var array List of theme layout options, these are ignored by core.
* To be used in individual theme layout files only.
*/
protected $_layout_options = array();
protected $_layout_options = null;
/**
* @var string An optional arbitrary parameter that can be set on pages where the context
@ -496,6 +496,9 @@ class moodle_page {
* @return array returns arrys with options for layout file
*/
protected function magic_get_layout_options() {
if (!is_array($this->_layout_options)) {
$this->_layout_options = $this->_theme->pagelayout_options($this->pagelayout);
}
return $this->_layout_options;
}
@ -1433,7 +1436,6 @@ class moodle_page {
if (is_null($this->_theme)) {
$themename = $this->resolve_theme();
$this->_theme = theme_config::load($themename);
$this->_layout_options = $this->_theme->pagelayout_options($this->pagelayout);
}
$this->_theme->setup_blocks($this->pagelayout, $this->blocks);