From 13d888771d96227c279fcbea426caff297b28b39 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 8 Nov 2013 13:15:23 +0800
Subject: [PATCH] MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()

---
 theme/afterburner/lib.php |  7 +++----
 theme/brick/lib.php       |  7 +++----
 theme/magazine/lib.php    | 14 ++++++--------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/theme/afterburner/lib.php b/theme/afterburner/lib.php
index ba1f38d7182..7d2a1406bf4 100644
--- a/theme/afterburner/lib.php
+++ b/theme/afterburner/lib.php
@@ -4,7 +4,7 @@ function afterburner_process_css($css, $theme) {
 
     // Set the background image for the logo
     $logo = $theme->setting_file_url('logo', 'logo');
-    $css = afterburner_set_logo($css, $logo);
+    $css = afterburner_set_logo($css, $logo, $theme);
 
     // Set custom CSS
     if (!empty($theme->settings->customcss)) {
@@ -17,12 +17,11 @@ function afterburner_process_css($css, $theme) {
     return $css;
 }
 
-function afterburner_set_logo($css, $logo) {
-    global $OUTPUT;
+function afterburner_set_logo($css, $logo, $theme) {
     $tag = '[[setting:logo]]';
     $replacement = $logo;
     if (is_null($replacement)) {
-        $replacement = $OUTPUT->pix_url('images/logo','theme');
+        $replacement = $theme->pix_url('images/logo','theme');
     }
 
     $css = str_replace($tag, $replacement, $css);
diff --git a/theme/brick/lib.php b/theme/brick/lib.php
index 6a255fae1bb..cd76200d6d9 100644
--- a/theme/brick/lib.php
+++ b/theme/brick/lib.php
@@ -49,12 +49,11 @@ function brick_set_headingcolor($css, $headingcolor) {
     return $css;
 }
 
-function brick_set_logo($css, $logo) {
- global $OUTPUT;
+function brick_set_logo($css, $logo, $theme) {
  $tag = '[[setting:logo]]';
  $replacement = $logo;
  if (is_null($replacement)) {
- $replacement = $OUTPUT->pix_url('logo', 'theme');
+ $replacement = $theme->pix_url('logo', 'theme');
  }
  $css = str_replace($tag, $replacement, $css);
  return $css;
@@ -112,7 +111,7 @@ function brick_process_css($css, $theme) {
     } else {
         $logo = null;
     }
-    $css = brick_set_logo($css, $logo);
+    $css = brick_set_logo($css, $logo, $theme);
     
     
     
diff --git a/theme/magazine/lib.php b/theme/magazine/lib.php
index 52c9d42980e..67171671e2f 100644
--- a/theme/magazine/lib.php
+++ b/theme/magazine/lib.php
@@ -71,7 +71,7 @@ function magazine_process_css($css, $theme) {
     } else {
         $background = null;
     }
-    $css = magazine_set_background($css, $background);
+    $css = magazine_set_background($css, $background, $theme);
     
      // Set the logo image
     if (!empty($theme->settings->logo)) {
@@ -79,7 +79,7 @@ function magazine_process_css($css, $theme) {
     } else {
         $logo = null;
     }
-    $css = magazine_set_logo($css, $logo);
+    $css = magazine_set_logo($css, $logo, $theme);
     
 
     // Return the CSS
@@ -162,23 +162,21 @@ function magazine_set_forumback($css, $forumback) {
     return $css;
 }
 
-function magazine_set_background($css, $background) {
-	global $OUTPUT;
+function magazine_set_background($css, $background, $theme) {
 	$tag = '[[setting:background]]';
 	$replacement = $background;
 	if (is_null($replacement)) {
-		$replacement = $OUTPUT->pix_url('bg4', 'theme');
+		$replacement = $theme->pix_url('bg4', 'theme');
  	}
 	$css = str_replace($tag, $replacement, $css);
 	return $css;
 }
 
-function magazine_set_logo($css, $logo) {
-	global $OUTPUT;
+function magazine_set_logo($css, $logo, $theme) {
 	$tag = '[[setting:logo]]';
 	$replacement = $logo;
 	if (is_null($replacement)) {
- 		$replacement = $OUTPUT->pix_url('logo', 'theme');
+		$replacement = $theme->pix_url('logo', 'theme');
  	}
 	$css = str_replace($tag, $replacement, $css);
 	return $css;