summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Profiler.php2
-rw-r--r--user_guide/changelog.html3
-rw-r--r--user_guide/helpers/index.html2
3 files changed, 4 insertions, 3 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 21c2135cc..eb2f25094 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -320,7 +320,7 @@ class CI_Profiler {
* @access private
* @return string
*/
- function run($output = '')
+ function run()
{
$output = '<br clear="all" />';
$output .= "<div style='background-color:#fff;padding:10px;'>";
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d029f3222..3ad46f016 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -160,7 +160,8 @@ 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 (#3285)</li>
+ <li>Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).</li>
+ <li>Removed an unused parameter from Profiler (#3332).</li>
<li>Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.</li>
<li>Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.</li>
<li>Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.</li>
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html
index cdcb22e0b..012dc9b60 100644
--- a/user_guide/helpers/index.html
+++ b/user_guide/helpers/index.html
@@ -110,7 +110,7 @@ This is done by opening the <var>application/config/autoload.php</var> file and
<h2>Now What?</h2>
-<p>In the Table of Contents you'll find a list of all the available Helper Files. Browse each one to see what they do.</p>
+<p>In the <a href="../toc.html">Table of Contents</a> you'll find a list of all the available Helper Files. Browse each one to see what they do.</p>
</div>