diff options
| author | zottel <github@zottel.net> | 2014-01-09 17:06:28 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-01-09 17:06:28 +0100 |
| commit | 5ee5bda998b47e82586c47de1d325508b57cefe5 (patch) | |
| tree | 677b773a1faa856822a3b493a855314b2c110904 /mod | |
| parent | ab81458768f5989779e2ae1e74bfc5ba2d0bac0c (diff) | |
| download | volse-hubzilla-5ee5bda998b47e82586c47de1d325508b57cefe5.tar.gz volse-hubzilla-5ee5bda998b47e82586c47de1d325508b57cefe5.tar.bz2 volse-hubzilla-5ee5bda998b47e82586c47de1d325508b57cefe5.zip | |
fix notices
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mod/channel.php b/mod/channel.php index 458783b18..8e44a329b 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -177,6 +177,10 @@ function channel_content(&$a, $update = 0, $load = false) { $r = q("SELECT parent AS item_id from item where mid = '%s' limit 1", dbesc($mid) ); + if (! $r) { + notice( t('Item not found.') . EOL); + } + } else { $r = q("SELECT distinct id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan @@ -207,8 +211,11 @@ function channel_content(&$a, $update = 0, $load = false) { dbesc($r[0]['item_id']), intval($a->profile['profile_uid']) ); - if (!$ismine) + if (!$ismine) { + if ($load) + notice( t('Permission denied.') . EOL); $r = array(); + } } if($r) { @@ -228,12 +235,10 @@ function channel_content(&$a, $update = 0, $load = false) { $items = fetch_post_tags($items, true); $items = conv_sort($items,'created'); - if ($mid && (! count($items))) { - // This will happen if channel is called with a mid from another - // channel, if we don't have sufficient permissions to view the - // item, or if it doesn't exist. - // Do we need separate error messages for that? - notice( t('Item not found.') . EOL); + if ($load && $mid && (! count($items))) { + // This will happen if we don't have sufficient permissions + // to view the parent item (or the item itself if it is toplevel) + notice( t('Permission denied.') . EOL); } } else { |