Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle

moodle · Aug 6, 2013 · 25b8ce9 · 25b8ce9
2 parents 9be9b41 + 0142523
commit 25b8ce9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
@@ -4393,3 +4393,11 @@ function get_related_contexts_string(context $context) {
         return (' ='.$context->id);
     }
 }
+
+/**
+ * @deprecated since Moodle 2.0 - use $PAGE->user_is_editing() instead.
+ * @see moodle_page->user_is_editing()
+ */
+function isediting() {
+    throw new coding_exception('isediting() can not be used any more, please use $PAGE->user_is_editing() instead.');
+}
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -3569,22 +3569,6 @@ function set_bounce_count($user, $reset=false) {
     }
 }
 
-/**
- * Determines if the currently logged in user is in editing mode.
- *
- * Note: originally this function had $userid parameter - it was not usable anyway
- *
- * @deprecated since Moodle 2.0 - use $PAGE->user_is_editing() instead.
- * @todo Deprecated function remove when ready
- *
- * @return bool
- */
-function isediting() {
-    global $PAGE;
-    debugging('call to deprecated function isediting(). Please use $PAGE->user_is_editing() instead', DEBUG_DEVELOPER);
-    return $PAGE->user_is_editing();
-}
-
 /**
  * Determines if the logged in user is currently moving an activity
  *