diff options
| author | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
|---|---|---|
| committer | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
| commit | 3b1355c595127280d6d84d8b617a91fbeda319f5 (patch) | |
| tree | 61e9d7c334e350846ffc3b528fbcbe85b036e1e9 /system/core/Loader.php | |
| parent | 576b47e9947d4f5bc25a3f72e3978a3d7f9ca1de (diff) | |
| parent | 738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/database/DB_driver.php
system/database/DB_query_builder.php
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 750e8cdd6..b1e315d47 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)))); } |