aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-10-04 15:33:39 -0700
committerredmatrix <mike@macgirvin.com>2016-10-04 15:33:39 -0700
commit26ea11c44f323be3c8d530556a04d972a46f6f02 (patch)
tree74b4115dd3fa7d94c1e09383938b4a842ece13c3
parentde1825e54b44210b421efde609f4874277f7aeab (diff)
parente259503933c5905d47be88f5df9ad4039f2feccb (diff)
downloadvolse-hubzilla-26ea11c44f323be3c8d530556a04d972a46f6f02.tar.gz
volse-hubzilla-26ea11c44f323be3c8d530556a04d972a46f6f02.tar.bz2
volse-hubzilla-26ea11c44f323be3c8d530556a04d972a46f6f02.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Module/Directory.php3
-rw-r--r--Zotlabs/Module/Settings/Features.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index ff96e1029..e1068223b 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -84,10 +84,9 @@ class Directory extends \Zotlabs\Web\Controller {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
- if(strpos($search,'=') && local_channel() && feature_enabled(local_channel(),'feature','advanced_dirsearch'))
+ if(strpos($search,'=') && local_channel() && feature_enabled(local_channel(), 'advanced_dirsearch'))
$advanced = $search;
-
$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
// Suggest channels if no search terms or keywords are given
diff --git a/Zotlabs/Module/Settings/Features.php b/Zotlabs/Module/Settings/Features.php
index 2d9bc0c88..5b642acc3 100644
--- a/Zotlabs/Module/Settings/Features.php
+++ b/Zotlabs/Module/Settings/Features.php
@@ -50,4 +50,4 @@ class Features {
return $o;
}
-} \ No newline at end of file
+}