diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-12-03 19:19:38 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-12-03 19:19:38 +0100 |
| commit | 335722503937979d9a6b10fc625c47527d3935f0 (patch) | |
| tree | fe8b0c30f0b460d1bf2ce852468e8884400df7b5 | |
| parent | 16153d811c3484b9211c3b0079d1446a992bad1c (diff) | |
Some polishing following PR #3384
| -rw-r--r-- | system/core/Output.php | 7 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 081423c99..af3c1e721 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -564,8 +564,7 @@ class CI_Output { .$CI->config->item('index_page') .$CI->uri->uri_string(); - // append querystring - empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING']; + empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING']; $cache_path .= md5($uri); @@ -650,8 +649,7 @@ class CI_Output { $cache_path = ($CFG->item('cache_path') === '') ? APPPATH.'cache/' : $CFG->item('cache_path'); // Build the file path. The file name is an MD5 hash of the full URI - $uri = $CFG->item('base_url').$CFG->item('index_page').$URI->uri_string; - // append querystring + $uri = $CFG->item('base_url').$CFG->item('index_page').$URI->uri_string; empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING']; $filepath = $cache_path.md5($uri); @@ -733,7 +731,6 @@ class CI_Output { $uri = $CI->uri->uri_string(); } - // append querystring empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING']; $cache_path .= md5($CI->config->item('base_url').$CI->config->item('index_page').$uri); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f336b3ae4..39e644e18 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -500,7 +500,7 @@ Release Date: Not Released - Added methods ``get_content_type()`` and ``get_header()``. - Added method ``delete_cache()``. - Changed caching behavior to compress the output before storing it, if ``$config['compress_output']`` is enabled. - - Added querystring to page caching. + - Changed caching to take the query string into account. - :doc:`Config Library <libraries/config>` changes include: |