1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

More support for e_DEBUG (in e107_config.php )

This commit is contained in:
Cameron
2013-06-08 16:06:52 -07:00
parent a877a2bf89
commit 9939deb3e1

View File

@@ -56,7 +56,7 @@ function defset($str, $default='')
/** /**
* Variant of {@link varset()}, but only return the value if both set AND 'true' * Variant of {@link varset()}, but only return the value if both set AND 'true'
* * @deprecated - use vartrue();
* @param mixed $val * @param mixed $val
* @param mixed $default [optional] * @param mixed $default [optional]
* @return mixed * @return mixed
@@ -81,7 +81,7 @@ function vartrue(&$val, $default='')
/** /**
* Variant of {@link defset()}, but only return the value if both defined AND 'true' * Variant of {@link defset()}, but only return the value if both defined AND 'true'
* * @deprecated - use deftrue()
* @param string $str * @param string $str
* @param mixed $default [optional] * @param mixed $default [optional]
* @return mixed * @return mixed
@@ -108,7 +108,7 @@ function deftrue($str, $default='')
function e107_include($fname) function e107_include($fname)
{ {
global $e107_debug, $_E107; global $e107_debug, $_E107;
$ret = (($e107_debug || isset($_E107['debug'])) ? include($fname) : @include($fname)); $ret = (($e107_debug || isset($_E107['debug']) || deftrue('e_DEBUG')) ? include($fname) : @include($fname));
return $ret; return $ret;
} }
@@ -117,7 +117,7 @@ function e107_include_once($fname)
global $e107_debug, $_E107; global $e107_debug, $_E107;
if(is_readable($fname)) if(is_readable($fname))
{ {
$ret = ($e107_debug || isset($_E107['debug'])) ? include_once($fname) : @include_once($fname); $ret = ($e107_debug || isset($_E107['debug']) || deftrue('e_DEBUG')) ? include_once($fname) : @include_once($fname);
} }
return (isset($ret)) ? $ret : ''; return (isset($ret)) ? $ret : '';
} }
@@ -126,7 +126,7 @@ function e107_require_once($fname)
{ {
global $e107_debug, $_E107; global $e107_debug, $_E107;
$ret = (($e107_debug || isset($_E107['debug'])) ? require_once($fname) : @require_once($fname)); $ret = (($e107_debug || isset($_E107['debug']) || deftrue('e_DEBUG')) ? require_once($fname) : @require_once($fname));
return $ret; return $ret;
} }
@@ -134,7 +134,7 @@ function e107_require_once($fname)
function e107_require($fname) function e107_require($fname)
{ {
global $e107_debug, $_E107; global $e107_debug, $_E107;
$ret = (($e107_debug || isset($_E107['debug'])) ? require($fname) : @require($fname)); $ret = (($e107_debug || isset($_E107['debug']) || deftrue('e_DEBUG')) ? require($fname) : @require($fname));
return $ret; return $ret;
} }