aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-25 14:36:17 -0700
committerfriendica <info@friendica.com>2012-05-25 14:36:17 -0700
commitfafd41f4bfcebdc0560f6b458df2cb089fce63ff (patch)
treef2ce66aec8e91af398cf95c87b98e50f5f75de89 /mod
parentd1345e505406b1a1cdc3fc26a1734916c8abc89d (diff)
downloadvolse-hubzilla-fafd41f4bfcebdc0560f6b458df2cb089fce63ff.tar.gz
volse-hubzilla-fafd41f4bfcebdc0560f6b458df2cb089fce63ff.tar.bz2
volse-hubzilla-fafd41f4bfcebdc0560f6b458df2cb089fce63ff.zip
keep private FB stuff out of personal notes
Diffstat (limited to 'mod')
-rw-r--r--mod/notes.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/notes.php b/mod/notes.php
index 0072ce447..64cc17a65 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -80,7 +80,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+ WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
+ AND `item`.`deleted` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ",
@@ -95,7 +96,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+ and `item`.`moderated` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra