diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-18 01:52:11 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-18 01:52:11 +0100 |
| commit | 545dc5cf65fef823a9ca8a5bcde6e346d4503d4c (patch) | |
| tree | 91a1e3e32cef9019ffbb5aeebe42197a1616bc3e /include | |
| parent | c545ada746a384988172ea1ce28d43dd4ac276b3 (diff) | |
| parent | a089064588352b60bebf27c94a51d480f8062368 (diff) | |
| download | volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.gz volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.bz2 volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index f781987d1..f279b2aa3 100644 --- a/include/api.php +++ b/include/api.php @@ -742,6 +742,8 @@ require_once('include/api_auth.php'); } $user_info = api_get_user($a); +// logger('status_with_media: ' . print_r($_REQUEST,true), LOGGER_DEBUG); + $_REQUEST['type'] = 'wall'; $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; diff --git a/include/conversation.php b/include/conversation.php index 09a6d51d7..57dc9d2a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) - ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' + ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' : '<a href="#" class="disabled">' . $name . '</a>' ); diff --git a/include/widgets.php b/include/widgets.php index 5a135ae52..fc6fee2ef 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1229,6 +1229,10 @@ function widget_album($args) { $owner_uid = get_app()->profile_uid; $sql_extra = permissions_sql($owner_uid); + + if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage')) + return ''; + if($args['album']) $album = $args['album']; if($args['title']) |