summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Profiler.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 9eb7dfa70..5676898c8 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -351,7 +351,7 @@ class CI_Profiler {
}
else
{
- $output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_memory_usage')."</div>";
+ $output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_memory')."</div>";
}
$output .= "</fieldset>";
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 4411aebfa..9f6c18220 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -66,6 +66,7 @@ SVN Revision: </p>
<ul>
<li>Documented a second argument in the <kbd>decode()</kbd> function for the <a href="libraries/encryption.html">Encryption Class</a>.</li>
<li>Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.</li>
+ <li>Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".</li>
</ul>
</li>
<li>Helpers