From: skodak <skodak>
Date: Tue, 23 May 2006 09:16:17 +0000 (+0000)
Subject: removed reliance on register globals; merged from MOODLE_16_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0629da47d2d6065cf2a1ea055390ffc772975bae;p=moodle.git

removed reliance on register globals; merged from MOODLE_16_STABLE
---

diff --git a/theme/cornflower/docstyles.php b/theme/cornflower/docstyles.php
index 235aab2dcb..5a4c4df2e5 100644
--- a/theme/cornflower/docstyles.php
+++ b/theme/cornflower/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///
diff --git a/theme/formal_white/docstyles.php b/theme/formal_white/docstyles.php
index a0fc8abeef..296b28d3df 100644
--- a/theme/formal_white/docstyles.php
+++ b/theme/formal_white/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///
diff --git a/theme/oceanblue/docstyles.php b/theme/oceanblue/docstyles.php
index 10db5de08f..074d4554ea 100644
--- a/theme/oceanblue/docstyles.php
+++ b/theme/oceanblue/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///
diff --git a/theme/orangewhite/docstyles.php b/theme/orangewhite/docstyles.php
index dd370bc971..bb9976e44e 100644
--- a/theme/orangewhite/docstyles.php
+++ b/theme/orangewhite/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///
diff --git a/theme/orangewhitepda/docstyles.php b/theme/orangewhitepda/docstyles.php
index dd370bc971..bb9976e44e 100644
--- a/theme/orangewhitepda/docstyles.php
+++ b/theme/orangewhitepda/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///
diff --git a/theme/standard/docstyles.php b/theme/standard/docstyles.php
index 235aab2dcb..5a4c4df2e5 100644
--- a/theme/standard/docstyles.php
+++ b/theme/standard/docstyles.php
@@ -1,13 +1,11 @@
 <?PHP /*  $Id$ */
 
 /// We use PHP so we can do value substitutions into the styles
-
-    if (!isset($themename)) {
-        $themename = NULL;
-    }
-
     $nomoodlecookie = true;
+
     require_once("../../config.php");
+    $themename = optional_param('themename', NULL, PARAM_SAFEDIR);
+
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 ///