diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-09 18:03:55 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-09 18:03:55 +0100 |
| commit | 8e2ca4eb4e669e1ae7223f58c4596454e241f207 (patch) | |
| tree | 21253402e41d00183541b6561e193b256276393d /system/core/Loader.php | |
| parent | 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 (diff) | |
| parent | c016a1102e2a77e0c27b9656c19a0460df24dfb6 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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 971d30325..3d91915c4 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)))); } |