summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorStefano Mazzega <stefano.mazzega@gmail.com>2014-12-03 13:43:07 +0100
committerStefano Mazzega <stefano.mazzega@gmail.com>2014-12-03 13:43:07 +0100
commitaf14e26e72ed484b2388b88bf8df245c2490a387 (patch)
treecec3ae5e548fdc91875e616253a6ef31704b7129 /system
parent6d61a058611b87043b25849fc144c256dbd79323 (diff)
Fixed code style. Update changelog. #2349
Diffstat (limited to 'system')
-rw-r--r--system/core/Output.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 58a9d896b..081423c99 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -565,7 +565,7 @@ class CI_Output {
.$CI->uri->uri_string();
// append querystring
- $uri .= (empty($_SERVER['QUERY_STRING'])) ? '' : '?' . $_SERVER['QUERY_STRING'];
+ empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
$cache_path .= md5($uri);
@@ -652,7 +652,7 @@ class CI_Output {
// 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 .= (empty($_SERVER['QUERY_STRING'])) ? '' : '?' . $_SERVER['QUERY_STRING'];
+ empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
$filepath = $cache_path.md5($uri);
@@ -734,7 +734,7 @@ class CI_Output {
}
// append querystring
- $uri .= (empty($_SERVER['QUERY_STRING'])) ? '' : '?' . $_SERVER['QUERY_STRING'];
+ empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
$cache_path .= md5($CI->config->item('base_url').$CI->config->item('index_page').$uri);