diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-06 12:11:27 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-06 12:11:27 +0100 |
| commit | f5e8e1c61e4ed82db42d82d01c4e52b767effa78 (patch) | |
| tree | 397eecc2636610fe1aa0bd4fb15858a02fbee469 | |
| parent | afca1f0b9585d7119b80e4b188d06ee0bcc8eca1 (diff) | |
Changed rewrite_short_tags to have no effect on PHP 5.4
| -rw-r--r-- | system/core/Loader.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 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)))); } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index bef405ee3..37016f832 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -95,6 +95,7 @@ Release Date: Not Released - Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions). - Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars(). - is_loaded() function from system/core/Commons.php now returns a reference. + - $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *<?=* will always be available. Bug fixes for 3.0 ------------------ |