diff options
author | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
commit | f950d27b3debfe08e022a477dbfb4fac101106e4 (patch) | |
tree | 38f62f0828163715c634e17290e2d77eb29d1b32 /include/widgets.php | |
parent | 8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (diff) | |
parent | 2a2da48d1871f408232a8397632f06528c8b43ae (diff) | |
download | volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.gz volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.bz2 volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/widgets.php')
-rw-r--r-- | include/widgets.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/widgets.php b/include/widgets.php index 9f8b88d54..9c8596a66 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -637,6 +637,7 @@ function widget_conversations($arr) { foreach($r as $rr) { $messages[] = array( + 'mailbox' => $mailbox, 'id' => $rr['id'], 'from_name' => $rr['from']['xchan_name'], 'from_url' => chanlink_hash($rr['from_xchan']), @@ -648,7 +649,8 @@ function widget_conversations($arr) { 'delete' => t('Delete conversation'), 'body' => $rr['body'], 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), - 'seen' => $rr['seen'] + 'seen' => $rr['seen'], + 'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id'])) ); } |