diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-26 14:14:18 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-26 14:14:18 -0800 |
| commit | 424af13891fb76889c134699d68b8be05f8514d0 (patch) | |
| tree | b0e0a9f613b7c62fffc5117617bbfae5e6652ae0 | |
| parent | 9081ddb455993cef96e121cebb2f569ae63a50f3 (diff) | |
| download | volse-hubzilla-424af13891fb76889c134699d68b8be05f8514d0.tar.gz volse-hubzilla-424af13891fb76889c134699d68b8be05f8514d0.tar.bz2 volse-hubzilla-424af13891fb76889c134699d68b8be05f8514d0.zip | |
fix undefined variable reference in widget_item
| -rw-r--r-- | include/widgets.php | 20 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/include/widgets.php b/include/widgets.php index 8e8f67ae6..891e9c018 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -807,20 +807,28 @@ function widget_suggestedchats($arr) { } function widget_item($arr) { - // FIXME there is no $a here - $uid = $a->profile['profile_uid']; - if((! $uid) || (! $arr['mid'])) + + $channel_id = 0; + if(array_key_exists('channel_id',$arr) && intval($arr['channel_id'])) + $channel_id = intval($arr['channel_id']); + if(! $channel_id) + $channel_id = get_app()->profile_uid; + if(! $channel_id) return ''; - if(! perm_is_allowed($uid, get_observer_hash(), 'view_pages')) + + if(! $arr['mid']) + return ''; + + if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages')) return ''; require_once('include/security.php'); - $sql_extra = item_permissions_sql($uid); + $sql_extra = item_permissions_sql($channel_id); $r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1", dbesc($arr['mid']), - intval($uid) + intval($channel_id) ); if(! $r) diff --git a/version.inc b/version.inc index 7b8a8ab83..869617f9e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-24.1288H +2016-01-26.1290H |