diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
commit | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (patch) | |
tree | d9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7 /mod/search.php | |
parent | 94d4cad701ab6b618afb288c88165c0ec17ae238 (diff) | |
parent | 1fae778421253b713c166f3e4d329997a9e214a3 (diff) | |
download | volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.gz volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.bz2 volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
search should be ok, but a little extra security won't hurt
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Fixed...merged with mainline THEN added beards.
added beard smileys
doc/Account-Basics.md
doc/Account-Basics.md
a
doc/Remove-Account.md
doc/Making-Friends.md
doc/Bugs-and-Issues.md
doc/Account-Basics.md
* master:
Diffstat (limited to 'mod/search.php')
-rwxr-xr-x | mod/search.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/search.php b/mod/search.php index fe09b671f..386592ea1 100755 --- a/mod/search.php +++ b/mod/search.php @@ -127,7 +127,7 @@ function search_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 ) + AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg |