diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-14 15:12:39 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-14 15:12:39 -0400 |
| commit | 1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e (patch) | |
| tree | 32486e253628ab64fa466f34dfc0703d9ce8644c /view | |
| parent | 16f729912a00cc92d0473f3d326080531a2fb393 (diff) | |
| parent | 6591b292a1e22e3eaec41af0a61a6911e9847098 (diff) | |
| download | volse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.tar.gz volse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.tar.bz2 volse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bogus empty list element in dfrn_request page when emailnet not enabled
zrl on random profile
zrl hook
bug #372 - category feeds
pass zrl's to/through global directory
* master:
Diffstat (limited to 'view')
| -rw-r--r-- | view/auto_request.tpl | 2 | ||||
| -rw-r--r-- | view/dfrn_request.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 2958397c9..961de9bb3 100644 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -7,7 +7,7 @@ $page_desc<br /> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -<li>$emailnet</li> +{{ if $emailnet }}<li>$emailnet</li>{{ endif }} </ul> </p> <p> diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index d8aa8b181..bd3bcbc42 100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,7 @@ $page_desc<br /> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -<li>$emailnet</li> +{{ if $emailnet }}<li>$emailnet</li>{{ endif }} </ul> $invite_desc </p> |