mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-22 15:15:20 +00:00
Merge branch 'dev' of ../z into dev
This commit is contained in:
commit
16dca8338f
2 changed files with 1 additions and 5 deletions
|
@ -322,9 +322,6 @@ class Directory extends Controller {
|
||||||
$homepageurl = ((x($profile,'homepage') == 1) ? html2plain($profile['homepage']) : '');
|
$homepageurl = ((x($profile,'homepage') == 1) ? html2plain($profile['homepage']) : '');
|
||||||
$hometown = ((x($profile,'hometown') == 1) ? html2plain($profile['hometown']) : False);
|
$hometown = ((x($profile,'hometown') == 1) ? html2plain($profile['hometown']) : False);
|
||||||
$about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'])) : False);
|
$about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'])) : False);
|
||||||
if ($about && $safe_mode) {
|
|
||||||
$about = html2plain($about);
|
|
||||||
}
|
|
||||||
|
|
||||||
$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
|
$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,5 @@
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
<!--disabled the more link until the zot and zot6 directories are merged due to conflicting results -->
|
<div class="suggest-widget-more"><a href="suggestions">{{$more}}</a></div>
|
||||||
<!--div class="suggest-widget-more"><a href="suggestions">{{$more}}</a></div-->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue