diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 10:55:59 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 10:55:59 -0500 |
| commit | 725daf2a5d31175764dc5110d2fa3e6bc60917bc (patch) | |
| tree | 1260f003b2351627ef0fa8fe0c1cb6f8ef630bdf /include/text.php | |
| parent | bcadd873eea086255152708c4d1cede4d3dcc581 (diff) | |
| parent | a3dcf491f14d6c044e3bd10844f5c737b21feae2 (diff) | |
| download | volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.tar.gz volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.tar.bz2 volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
template proc: allow isolation of var name between [ and ]
group: fix create new group form
templates: fix tags
template proc: remove unused function and commented out code
template proc: first optimization
* master:
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 4276b7fcb..042ee982c 100755 --- a/include/text.php +++ b/include/text.php @@ -14,7 +14,13 @@ if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - return $t->replace($s,$r); + //$ts = microtime(); + $r = $t->replace($s,$r); + //$tt = microtime() - $ts; + + //$a = get_app(); + //$a->page['debug'] .= "$tt <br>\n"; + return $r; }} |