aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-06-01 08:19:52 +0200
committerGitHub <noreply@github.com>2017-06-01 08:19:52 +0200
commit56f3b121712edcfa9a33178dccd89fadd0549642 (patch)
tree54afefd21ae000757b5c90abeb67a5a7034f42f3 /Zotlabs
parent927313968aa2bd60464ef754c64ccaa746a8fed3 (diff)
parenta7ecf519156c1110acbb0eadd13dee63b7adaabd (diff)
downloadvolse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.tar.gz
volse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.tar.bz2
volse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.zip
Merge pull request #802 from zotlabs/searchwebpages
provide ability to search webpages (either public or which contain th…
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Search.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index aacdc88e7..a78a023ff 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -15,7 +15,7 @@ class Search extends \Zotlabs\Web\Controller {
if((get_config('system','block_public')) || (get_config('system','block_public_search'))) {
if ((! local_channel()) && (! remote_channel())) {
notice( t('Public access denied.') . EOL);
- return;
+ return;
}
}
@@ -144,7 +144,7 @@ class Search extends \Zotlabs\Web\Controller {
}
- $item_normal = item_normal();
+ $item_normal = item_normal_search();
$pub_sql = public_permissions_sql($observer_hash);
require_once('include/channel.php');