diff options
| -rw-r--r-- | system/codeigniter/CodeIgniter.php | 2 | ||||
| -rw-r--r-- | system/libraries/Output.php | 4 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index da20c48a1..74e5e8b44 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -103,7 +103,7 @@ $OUT =& load_class('Output'); if ($EXT->_call_hook('cache_override') === FALSE)
{
- if ($OUT->_display_cache($CFG, $RTR) == TRUE)
+ if ($OUT->_display_cache($CFG, $URI) == TRUE)
{
exit;
}
diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 49cfc0a28..cc88f40a2 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -321,10 +321,8 @@ class CI_Output { * @access public
* @return void
*/
- function _display_cache(&$CFG, &$RTR)
+ function _display_cache(&$CFG, &$URI)
{
- $URI =& load_class('URI');
-
$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
if ( ! is_dir($cache_path) OR ! is_really_writable($cache_path))
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 47e517dc3..110f1c27b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -81,6 +81,7 @@ SVN Revision: not currently released</p> </li>
<li>Other changes
<ul>
+ <li>Removed an unused Router reference in <kbd>_display_cache()</kbd>.</li>
<li>Added ability to <a href="libraries/input.html">use xss_clean() to test images</a> for XSS, useful for upload security.</li>
<li>Improved security in <kbd>xss_clean()</kbd>.</li>
<li>Considerably expanded list of mobile user-agents in config/user_agents.php.</li>
|