summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-03 19:19:38 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-03 19:19:38 +0100
commit335722503937979d9a6b10fc625c47527d3935f0 (patch)
treefe8b0c30f0b460d1bf2ce852468e8884400df7b5 /system
parent16153d811c3484b9211c3b0079d1446a992bad1c (diff)
Some polishing following PR #3384
Diffstat (limited to 'system')
-rw-r--r--system/core/Output.php7
1 files changed, 2 insertions, 5 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);