aboutsummaryrefslogtreecommitdiffstats
path: root/include/widgets.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
commite07ff7d3fbb9bef720831dc71470b70a882abfdf (patch)
tree68934f0deb2fb9edef69954d1016734bc8662957 /include/widgets.php
parentb22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff)
parente769fbaffb09aa673d7475c598e7df7e7978d210 (diff)
downloadvolse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/widgets.php')
-rw-r--r--include/widgets.php4
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']))
);
}