diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index b4c5c446b3d..6860c0344c9 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -74,6 +74,25 @@ function optional_variable(&$var, $default=0) { } } +/** + * Ensure that a variable is set + * + * Return $var if it is defined, otherwise return $default, + * This function is very similar to {@link optional_variable()} + * + * @param mixed $var the variable which may be unset + * @param mixed $default the value to return if $var is unset + * @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; +} + /** * Determines if a user an admin * diff --git a/lib/weblib.php b/lib/weblib.php index 2e5a357402e..e079a47a5e1 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -136,25 +136,6 @@ function p($var, $strip=false) { } -/** - * Ensure that a variable is set - * - * Return $var if it is defined, otherwise return $default, - * This function is very similar to {@link optional_variable()} - * - * @param mixed $var the variable which may be unset - * @param mixed $default the value to return if $var is unset - * @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; -} - /** * Remove query string from url *