deprecated nvl() function similar to optional_variable(); merged from MOODLE_16_STABLE

diff --git a/lib/weblib.php b/lib/weblib.php
index 56cc2a3ecf55b96500e10ac391f21fd290be80a3..1406223504b574b6c818ebb1a2947ae819059b82 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -142,7 +142,11 @@ function p($var, $strip=false) {
  * @return   mixed
  */
 function nvl(&$var, $default='') {
+    global $CFG;
 
+    if (!empty($CFG->disableglobalshack)) {
+      error( "The nvl() function is deprecated ($var, $default)." );
+    }
     return isset($var) ? $var : $default;
 }