Commit cbcc9852 authored by Petr Skoda's avatar Petr Skoda
Browse files

MDL-21125 removing obsolete global $THEME

parent f6794ace
...@@ -13,6 +13,7 @@ required changes in code: ...@@ -13,6 +13,7 @@ required changes in code:
* rewrite backup/restore * rewrite backup/restore
* theme changes: move plugin styles into blocks/xxx/styles.css and use new css markers for images, * theme changes: move plugin styles into blocks/xxx/styles.css and use new css markers for images,
move all images into new blocks/xxx/pix/ directory and use new outputlib api move all images into new blocks/xxx/pix/ directory and use new outputlib api
old global $THEME is fully replaced by $OUTPUT
optional - no changes needed in older code: optional - no changes needed in older code:
......
...@@ -944,18 +944,13 @@ class moodle_page { ...@@ -944,18 +944,13 @@ class moodle_page {
/** /**
* Force this page to use a particular theme. * Force this page to use a particular theme.
* *
* Please use this cautiously. It is only intended to be used by the themes selector * Please use this cautiously. It is only intended to be used by the themes selector admin page.
* admin page, and theme/styles.php.
* *
* @param $themename the name of the theme to use. * @param $themename the name of the theme to use.
*/ */
public function force_theme($themename) { public function force_theme($themename) {
global $PAGE, $THEME;
$this->ensure_theme_not_set(); $this->ensure_theme_not_set();
$this->_theme = theme_config::load($themename); $this->_theme = theme_config::load($themename);
if ($this === $PAGE) {
$THEME = $this->_theme;
}
} }
/** /**
...@@ -1025,10 +1020,10 @@ class moodle_page { ...@@ -1025,10 +1020,10 @@ class moodle_page {
* *
* Make sure the right theme for this page is loaded. Tell our * Make sure the right theme for this page is loaded. Tell our
* blocks_manager about the theme block regions, and then, if * blocks_manager about the theme block regions, and then, if
* we are $PAGE, set up the globals $THEME and $OUTPUT. * we are $PAGE, set up the global $OUTPUT.
*/ */
public function initialise_theme_and_output() { public function initialise_theme_and_output() {
global $OUTPUT, $PAGE, $SITE, $THEME; global $OUTPUT, $PAGE, $SITE;
if (!empty($this->_wherethemewasinitialised)) { if (!empty($this->_wherethemewasinitialised)) {
return; return;
...@@ -1047,7 +1042,6 @@ class moodle_page { ...@@ -1047,7 +1042,6 @@ class moodle_page {
$this->_theme->setup_blocks($this->pagelayout, $this->blocks); $this->_theme->setup_blocks($this->pagelayout, $this->blocks);
if ($this === $PAGE) { if ($this === $PAGE) {
$THEME = $this->_theme;
$OUTPUT = $this->get_renderer('core'); $OUTPUT = $this->get_renderer('core');
} }
......
...@@ -110,19 +110,13 @@ global $COURSE; ...@@ -110,19 +110,13 @@ global $COURSE;
* to change something that affects the current theme ($PAGE->course, logged in use, * to change something that affects the current theme ($PAGE->course, logged in use,
* httpsrequried ... will result in an exception.) * httpsrequried ... will result in an exception.)
* *
* Please note the $OUTPUT is replacing the old global $THEME object.
*
* @global object $OUTPUT * @global object $OUTPUT
* @name $OUTPUT * @name $OUTPUT
*/ */
global $OUTPUT; global $OUTPUT;
/**
* $THEME is a global that defines the current theme.
*
* @global theme_config $THEME
* @name THEME
*/
global $THEME;
/** /**
* Shared memory cache. * Shared memory cache.
* @global object $MCACHE * @global object $MCACHE
......
...@@ -22,6 +22,7 @@ required changes in code: ...@@ -22,6 +22,7 @@ required changes in code:
* theme changes: move plugin styles into mod/xxx/styles.css and use new css markers for images, * theme changes: move plugin styles into mod/xxx/styles.css and use new css markers for images,
move all images into new mod/xxx/pix/ directory and use new outputlib api move all images into new mod/xxx/pix/ directory and use new outputlib api
move module icon to mod/xxx/pix/icon.gif move module icon to mod/xxx/pix/icon.gif
old global $THEME is fully replaced by $OUTPUT
optional - no changes needed in older code: optional - no changes needed in older code:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment