harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes for the legacy stuff as we push forward to new stuff

Browse Source
This commit is contained in:
friendica 2012-07-26 02:27:12 -07:00
parent acfe9e77bf
commit 4ec7ef5223
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/template_processor.php
View File

@ -189,7 +189,7 @@
} }
public function replace($s, $r) { public function replace($s, $r) {
// $t1 = dba_timer(); $t1 = dba_timer();
$this->r = $r; $this->r = $r;
$s = $this->_build_nodes($s); $s = $this->_build_nodes($s);
@ -200,15 +200,15 @@
// remove comments block // remove comments block
$s = preg_replace('/{#[^#]*#}/', "" , $s); $s = preg_replace('/{#[^#]*#}/', "" , $s);
// $t2 = dba_timer(); $t2 = dba_timer();
// replace strings recursively (limit to 10 loops) // replace strings recursively (limit to 10 loops)
$os = ""; $count=0; $os = ""; $count=0;
while($os!=$s && $count<10){ while(($os !== $s) && $count<10){
$os=$s; $count++; $os=$s; $count++;
$s = $this->var_replace($s); $s = $this->var_replace($s);
} }
// $t3 = dba_timer(); $t3 = dba_timer();
// logger('macro timer: ' . sprintf('%01.4f %01.4f',$t3 - $t2, $t2 - $t1)); // logger('macro timer: ' . sprintf('%01.4f %01.4f',$t3 - $t2, $t2 - $t1));
return $s; return $s;

1
js/main.js
View File

@ -336,6 +336,7 @@ function updateConvItems(mode,data) {
update_url = buildCmd(); update_url = buildCmd();
} }
else { else {
page_load = false;
var udargs = ((page_load) ? '/load' : ''); var udargs = ((page_load) ? '/load' : '');
update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
} }