aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/template_processor.php8
-rw-r--r--js/main.js1
2 files changed, 5 insertions, 4 deletions
diff --git a/include/template_processor.php b/include/template_processor.php
index e891b8bf2..9c6e27916 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -189,7 +189,7 @@
}
public function replace($s, $r) {
-// $t1 = dba_timer();
+ $t1 = dba_timer();
$this->r = $r;
$s = $this->_build_nodes($s);
@@ -200,15 +200,15 @@
// remove comments block
$s = preg_replace('/{#[^#]*#}/', "" , $s);
-// $t2 = dba_timer();
+ $t2 = dba_timer();
// replace strings recursively (limit to 10 loops)
$os = ""; $count=0;
- while($os!=$s && $count<10){
+ while(($os !== $s) && $count<10){
$os=$s; $count++;
$s = $this->var_replace($s);
}
-// $t3 = dba_timer();
+ $t3 = dba_timer();
// logger('macro timer: ' . sprintf('%01.4f %01.4f',$t3 - $t2, $t2 - $t1));
return $s;
diff --git a/js/main.js b/js/main.js
index 55c93cb62..438b7db14 100644
--- a/js/main.js
+++ b/js/main.js
@@ -336,6 +336,7 @@ function updateConvItems(mode,data) {
update_url = buildCmd();
}
else {
+ page_load = false;
var udargs = ((page_load) ? '/load' : '');
update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
}