aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-02-27 13:34:19 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-02-27 13:34:19 -0500
commit8c2bda46f7ad726da5cb69b96035142dc6dd1ca5 (patch)
treee9b11902c9fe447d1057b8474b85c527a5667cac
parentb1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 (diff)
parente11b51aca14ea36b514fdd4348443f4fae79b2ca (diff)
downloadvolse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.tar.gz
volse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.tar.bz2
volse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master:
-rwxr-xr-xinclude/template_processor.php8
-rwxr-xr-xmod/contacts.php4
-rwxr-xr-xview/contact_template.tpl4
3 files changed, 9 insertions, 7 deletions
diff --git a/include/template_processor.php b/include/template_processor.php
index 7f270fb4b..28c3f07dd 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -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);
}
diff --git a/mod/contacts.php b/mod/contacts.php
index c8edea151..ce352fe20 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -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']),
);
}
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index d6f114d6e..f4c0670bf 100755
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -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>