summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--user_guide/changelog.html1
-rw-r--r--user_guide/libraries/output.html6
2 files changed, 7 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ac421286b..8dcc9060f 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -72,6 +72,7 @@ Hg Tag: </p>
</ul>
<li>Libraries
<ul>
+ <li>Added <var>$parse_exec_vars</var> property to Output library.</li>
<li>Added ability to enable / disable individual sections of the <a href="general/profiling.html">Profiler</a></li>
<li>Added "is_object" into the list of unit tests capable of being run.</li>
<li>Table library will generate an empty cell with a blank string, or NULL value.</li>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 70f0c1f7b..411048088 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -137,6 +137,12 @@ at the bottom of your pages for debugging and optimization purposes.</p>
<h2>$this->output->cache();</h2>
<p>The CodeIgniter output library also controls caching. For more information, please see the <a href="../general/caching.html">caching documentation</a>.</p>
+<h2>Parsing Execution Variables</h2>
+
+ <p>CodeIgniter will parse the pseudo-variables <var>{elapsed_time}</var> and <var>{memory_usage}</var> in your output by default. To disable this, set the <var>$parse_exec_vars</var> class property to <var>FALSE</var> in your controller.
+
+ <code>$this->output->parse_exec_vars = FALSE;</code>
+
</div>
<!-- END CONTENT -->