aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-18 17:38:07 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-18 17:38:07 -0700
commiteae241df5682fe35ab875608164f1745d80c2301 (patch)
treeab1f1526341050830345917c0e1b4673cbcefc7c /mod
parent4c319a98a825d58b78d5967d954c7affaddd4f2b (diff)
parentc2ca2a09e775f59706e386a7e2de0816ba680e54 (diff)
downloadvolse-hubzilla-eae241df5682fe35ab875608164f1745d80c2301.tar.gz
volse-hubzilla-eae241df5682fe35ab875608164f1745d80c2301.tar.bz2
volse-hubzilla-eae241df5682fe35ab875608164f1745d80c2301.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'mod')
-rw-r--r--mod/blocks.php5
-rw-r--r--mod/layouts.php5
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/blocks.php b/mod/blocks.php
index 56da9caf7..11e7d4a30 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -108,8 +108,9 @@ function blocks_content(&$a) {
$editor = status_editor($a,$x);
$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
- where item_id.uid = %d and service = 'BUILDBLOCK' order by item.created desc",
- intval($owner)
+ where item_id.uid = %d and service = 'BUILDBLOCK' and item_restrict = %d order by item.created desc",
+ intval($owner),
+ intval(ITEM_BUILDBLOCK)
);
$pages = null;
diff --git a/mod/layouts.php b/mod/layouts.php
index 9d27ed4ac..ba1d900a7 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -135,8 +135,9 @@ function layouts_content(&$a) {
$editor = status_editor($a,$x);
$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
- where item_id.uid = %d and service = 'PDL' order by item.created desc",
- intval($owner)
+ where item_id.uid = %d and service = 'PDL' and item_restrict = %d order by item.created desc",
+ intval($owner),
+ intval(ITEM_PDL)
);
$pages = null;