Merge branch 'dev' of ../z into dev

This commit is contained in:
nobody 2020-08-31 23:31:39 -07:00
commit 16dca8338f
2 changed files with 1 additions and 5 deletions

View file

@ -322,9 +322,6 @@ class Directory extends Controller {
$homepageurl = ((x($profile,'homepage') == 1) ? html2plain($profile['homepage']) : '');
$hometown = ((x($profile,'hometown') == 1) ? html2plain($profile['hometown']) : 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'] : '');

View file

@ -6,6 +6,5 @@
{{/foreach}}
{{/if}}
<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>