summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-20 17:05:58 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-20 17:05:58 +0100
commitf62747451d1f040b36db7611255d7c1b3cdffcdf (patch)
treebdbf06d942fb0a19454d987de0d89f142709013c /system/core/Loader.php
parentbb3edf12d0ca82c62f7b7d570108375ec4379749 (diff)
Don't use error suppression on ini_get() either
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 2d40ab5b8..be2b05cbe 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -901,9 +901,7 @@ class CI_Loader {
// If the PHP installation does not support short tags we'll
// do a little string replacement, changing the short tags
// to standard PHP echo statements.
- if ( ! is_php('5.4') && (bool) @ini_get('short_open_tag') === FALSE
- && config_item('rewrite_short_tags') === TRUE && function_usable('eval')
- )
+ if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE && function_usable('eval'))
{
echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
}