diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-07 12:06:20 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-07 12:06:20 +0100 |
| commit | 4690d00141352db8ca96359cbbf65ce6eb4345c4 (patch) | |
| tree | 40347f010a4b15a0eb73f09de3c928258bc9d856 /mod/search.php | |
| parent | b2df1205ef805ab471a73f906d2eda5603a1aa66 (diff) | |
| parent | dd2ff7c796302648992835940600c18fd200c388 (diff) | |
| download | volse-hubzilla-4690d00141352db8ca96359cbbf65ce6eb4345c4.tar.gz volse-hubzilla-4690d00141352db8ca96359cbbf65ce6eb4345c4.tar.bz2 volse-hubzilla-4690d00141352db8ca96359cbbf65ce6eb4345c4.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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 |