removed reliance on register globals; merged from MOODLE_16_STABLE

diff --git a/theme/cornflower/docstyles.php b/theme/cornflower/docstyles.php
index 235aab2dcb5ead2476e924b454ebe1fece7cc372..5a4c4df2e565b1abdb2b2377b07ed7a243506af1 100644 (file)
--- 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 a0fc8abeef1bd2cb7d0e495ee73822cfc3f9e5d7..296b28d3dff7dd6252705c8d0ccd968857fa0db5 100644 (file)
--- 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 10db5de08ffee6a5ef4d048d5f0aed13f7e35607..074d4554ea97f69f0be685663259ffc5e6f08317 100644 (file)
--- 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 dd370bc9715a943800f29152206c3619160640cd..bb9976e44ecf627209b5771c1bc60c99fb835b4f 100644 (file)
--- 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 dd370bc9715a943800f29152206c3619160640cd..bb9976e44ecf627209b5771c1bc60c99fb835b4f 100644 (file)
--- 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 235aab2dcb5ead2476e924b454ebe1fece7cc372..5a4c4df2e565b1abdb2b2377b07ed7a243506af1 100644 (file)
--- 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);
 
 ///