diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-19 13:46:36 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-19 13:46:36 +0100 |
| commit | acca91e12446c53733d3dca8436b339fcfed3e09 (patch) | |
| tree | 0da97e6d91ab3f787e7fa93fd55a50e02641a7cb | |
| parent | 537242cdeb87c36dae998710032fb7b8aaf74692 (diff) | |
| parent | c8aebc6e291468e0cd5074df92b3788d48568297 (diff) | |
Merge branch 'develop' into feature/session
| -rw-r--r-- | system/core/Common.php | 4 | ||||
| -rw-r--r-- | system/database/DB.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index b5a36636e..71da829d3 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -615,7 +615,7 @@ if ( ! function_exists('_error_handler')) $_error->log_exception($severity, $message, $filepath, $line); // Should we display the error? - if (ini_get('display_errors')) + if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) { $_error->show_php_error($severity, $message, $filepath, $line); } @@ -650,7 +650,7 @@ if ( ! function_exists('_exception_handler')) $_error->log_exception('error', 'Exception: '.$exception->getMessage(), $exception->getFile(), $exception->getLine()); // Should we display the error? - if (ini_get('display_errors')) + if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) { $_error->show_exception($exception); } diff --git a/system/database/DB.php b/system/database/DB.php index fc9f4d0dc..a33627191 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -130,7 +130,7 @@ function &DB($params = '', $query_builder_override = NULL) { if (is_string($val) && in_array(strtoupper($val), array('TRUE', 'FALSE', 'NULL'))) { - $val = var_export($val); + $val = var_export($val, TRUE); } $params[$key] = $val; |