summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-01-22 22:09:26 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-01-22 22:09:26 +0100
commit77fee9affdd28c647759965aec20028aeb1d8798 (patch)
tree5a5f1b2c524bae58da30b75a0cc50994dba9c4b5
parent9cee79136d2b197584bc6e076e7df5d69344be1c (diff)
removed extraneous load of $CFG in _display_cache()
-rw-r--r--system/libraries/Output.php1
-rw-r--r--user_guide/changelog.html1
2 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index ed9f6f4ff..f98dab5e0 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -323,7 +323,6 @@ class CI_Output {
*/
function _display_cache(&$CFG, &$RTR)
{
- $CFG =& load_class('Config');
$URI =& load_class('URI');
$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index b4c6e623c..a6a367b28 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -154,6 +154,7 @@ Change Log
<ul>
<li>Removed an extraneous call to loading models (#3286).</li>
+ <li>Removed extraneous load of $CFG in _display_cache() of the Output class</li>
<li>Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.</li>
<li>Fixed a bug (#3289) in the File Helper where temp files in directories being tested with is_really_writable() were not being handled properly</li>
<li>Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.</li>