aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-03-02 17:44:09 +0100
committerMichael <icarus@dabo.de>2012-03-02 17:44:09 +0100
commitccfe402fb0b92dc8e62dc87137743851441e27f6 (patch)
tree00d7622701719a506638a3bca92f9e68f2624f48 /include/text.php
parent20817b4b8ea8b7d074d57a3fd752862931cf711c (diff)
parenta3dcf491f14d6c044e3bd10844f5c737b21feae2 (diff)
downloadvolse-hubzilla-ccfe402fb0b92dc8e62dc87137743851441e27f6.tar.gz
volse-hubzilla-ccfe402fb0b92dc8e62dc87137743851441e27f6.tar.bz2
volse-hubzilla-ccfe402fb0b92dc8e62dc87137743851441e27f6.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php8
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;
}}