clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  revert 01a2791e3a to avoid random preg internal errors. fix contact_template

* master:
This commit is contained in:
Simon L'nu 2012-02-27 13:34:19 -05:00
parent b1cdc5a932 e11b51aca1
commit 8c2bda46f7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/template_processor.php
View File

@ -160,7 +160,8 @@
krsort($this->nodes);
return $s;
}
/*
private function _str_replace($str){
#$this->search,$this->replace,
$searchs = $this->search;
@ -183,7 +184,7 @@
}
return str_replace($this->search,$this->replace, $str);
}
}*/
public function replace($s, $r) {
@ -205,7 +206,8 @@
$os = ""; $count=0;
while($os!=$s && $count<10){
$os=$s; $count++;
$s = $this->_str_replace($s);
//$s = $this->_str_replace($s);
$s = str_replace($this->search, $this->replace, $s);
}
return template_unescape($s);
}

4
mod/contacts.php
View File

@ -504,8 +504,8 @@ function contacts_content(&$a) {
'name' => $rr['name'],
'username' => $rr['name'],
'sparkle' => $sparkle,
'url' => $url,
'item' => $rr,
'itemurl' => $rr['url'],
'network' => network_to_name($rr['network']),
);
}

4
view/contact_template.tpl
View File

@ -17,8 +17,8 @@
</div>
<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.item.url</div>
<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.item.network|network_to_name</div>
<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
</div>