aboutsummaryrefslogtreecommitdiffstats
path: root/mod/directory.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
committerThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
commit7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree03b41e86e0790895fe56488beea2b5f554fbaeae /mod/directory.php
parent733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parentdf34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
downloadvolse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: mod/page.php
Diffstat (limited to 'mod/directory.php')
-rw-r--r--mod/directory.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 1f22e9bf8..92fb36ea7 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,7 @@
<?php
require_once('include/dir_fns.php');
+require_once('include/widgets.php');
function directory_init(&$a) {
@@ -10,15 +11,13 @@ function directory_init(&$a) {
function directory_aside(&$a) {
- if(local_user()) {
- require_once('include/contact_widgets.php');
- $a->set_widget('find_people',findpeople_widget());
- }
-
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
}
-
+
+ require_once('include/contact_widgets.php');
+ $a->set_widget('find_people',findpeople_widget());
+
$a->set_widget('safe_search',dir_safe_mode());
$a->set_widget('dir_sort_order',dir_sort_links());
@@ -213,6 +212,8 @@ function directory_content(&$a) {
if($j['keywords']) {
$a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords']));
}
+ $a->set_widget('suggest',widget_suggestions(array()));
+
// logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);