themes: MDL-19077 move deprecated function page_id_and_class to deprecatedlib.php

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 9bb037492cb46560da49eb596c04281445f16d64..833ca4286415d5f3ea80ce9958a962d31d27614f 100644 (file)
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -1815,6 +1815,20 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
     exit;
 }
 
+/**
+ * @todo Remove this deprecated function when no longer used
+ * @deprecated since Moodle 2.0 - use $PAGE->pagetype instead of the .
+ *
+ * @param string $getid used to return $PAGE->pagetype.
+ * @param string $getclass used to return $PAGE->legacyclass.
+ */
+function page_id_and_class(&$getid, &$getclass) {
+    global $PAGE;
+    debugging('Call to deprecated function page_id_and_class. Please use $PAGE->pagetype instead.', DEBUG_DEVELOPER);
+    $getid = $PAGE->pagetype;
+    $getclass = $PAGE->legacyclass;
+}
+
 /**
  * Prints some red text using echo
  *

diff --git a/lib/weblib.php b/lib/weblib.php
index 932d90439102adddac94d2def07bce2ee6954201..a2001d3cada0ab4c3739697c36793aa2ff5237e8 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4783,12 +4783,6 @@ function editorshortcutshelpbutton() {
 /**
  * Print a message and exit.
  *
- * @global object
- * @global object Apparently not used in this function
- * @global object
- * @global object
- * @global object
- * @uses CLI_SCRIPT
  * @param string $message The message to print in the notice
  * @param string $link The link to use for the continue button
  * @param object $course A course object
@@ -4861,12 +4855,6 @@ function notice_yesno ($message, $linkyes, $linkno, $optionsyes=NULL, $optionsno
  * <strong>Good practice:</strong> You should call this method before starting page
  * output by using any of the OUTPUT methods.
  *
- * @global object
- * @global object
- * @global object
- * @uses $_COOKIE
- * @uses DEBUG_DEVELOPER
- * @uses DEBUG_ALL
  * @param string $url The URL to redirect to
  * @param string $message The message to display to the user
  * @param int $delay The delay before redirecting
@@ -5115,21 +5103,6 @@ function rebuildnolinktag($text) {
     return $text;
 }
 
-/**
- * @todo Remove this deprecated function when no longer used
- * @deprecated since Moodle 2.0 - use $PAGE->pagetype instead of the .
- *
- * @global object
- * @param string $getid used to return $PAGE->pagetype.
- * @param string $getclass used to return $PAGE->legacyclass.
- */
-function page_id_and_class(&$getid, &$getclass) {
-    global $PAGE;
-    debugging('Call to deprecated function page_id_and_class. Please use $PAGE->pagetype instead.', DEBUG_DEVELOPER);
-    $getid = $PAGE->pagetype;
-    $getclass = $PAGE->legacyclass;
-}
-
 /**
  * Prints a maintenance message from $CFG->maintenance_message or default if empty
  * @return void