diff options
author | Mike Funk <mfunk@xulonpress.com> | 2012-03-06 21:19:07 +0100 |
---|---|---|
committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-06 21:19:07 +0100 |
commit | 8f7db7bf06ab3014f80fdb730df13b57d87c2196 (patch) | |
tree | a61142583e19002db610e3ef74f3a9f0eedbd8e0 /system/core/Loader.php | |
parent | c91a66cd7c770f8060cbe366491c1f4de9147da4 (diff) | |
parent | 738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff) |
updated and merged user guide with develop branch.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r-- | system/core/Loader.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 12daaa928..20cf7ef33 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -833,7 +833,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 ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) + if ( ! is_php('5.4') && (bool) @ini_get('short_open_tag') === FALSE && config_item('rewrite_short_tags') == TRUE) { echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path)))); } |