diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 13:34:19 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 13:34:19 -0500 |
| commit | 8c2bda46f7ad726da5cb69b96035142dc6dd1ca5 (patch) | |
| tree | e9b11902c9fe447d1057b8474b85c527a5667cac /view | |
| parent | b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 (diff) | |
| parent | e11b51aca14ea36b514fdd4348443f4fae79b2ca (diff) | |
| download | volse-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:
Diffstat (limited to 'view')
| -rwxr-xr-x | view/contact_template.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
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> |