aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/channel.php6
-rw-r--r--mod/cloud.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 20f6fec18..dac4ba2bf 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -135,9 +135,11 @@ function channel_content(&$a, $update = 0, $load = false) {
if(($update) && (! $load)) {
if ($mid) {
- $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $sql_extra limit 1",
+ $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0
+ AND (item_flags & %d) $sql_extra limit 1",
dbesc($mid),
- intval($a->profile['profile_uid'])
+ intval($a->profile['profile_uid']),
+ intval(ITEM_WALL)
);
} else {
$r = q("SELECT distinct parent AS `item_id` from item
diff --git a/mod/cloud.php b/mod/cloud.php
index 29218f84e..2d8442807 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -58,6 +58,8 @@ function cloud_init(&$a) {
$auth->channel_name = $channel['channel_address'];
$auth->channel_id = $channel['channel_id'];
$auth->channel_hash = $channel['channel_hash'];
+ if($channel['channel_timezone'])
+ $auth->timezone = $channel['channel_timezone'];
}
$auth->observer = $ob_hash;
}