diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-25 16:02:41 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-25 16:02:41 -0700 |
| commit | 08f15a6fc60023f739676d3751e2cd14cecf52a4 (patch) | |
| tree | dcbebfa488aa750cb35e2b311957ea419e032eb2 /Zotlabs/Widget/Conversations.php | |
| parent | c24cfbc62af111f18576cfde8e4e920e66c57ff5 (diff) | |
| parent | caf077cbf893cd02932194e1641c861ffcc2e339 (diff) | |
| download | volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.tar.gz volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.tar.bz2 volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Widget/Conversations.php')
| -rw-r--r-- | Zotlabs/Widget/Conversations.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php index 4fd754f66..56510750f 100644 --- a/Zotlabs/Widget/Conversations.php +++ b/Zotlabs/Widget/Conversations.php @@ -40,6 +40,8 @@ class Conversations { foreach($r as $rr) { + $selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']); + $messages[] = array( 'mailbox' => $mailbox, 'id' => $rr['id'], @@ -54,7 +56,7 @@ class Conversations { 'body' => $rr['body'], 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'), 'seen' => $rr['seen'], - 'selected' => ((argc() == 2) ? (intval(argv(1)) == intval($rr['id'])) : ($r[0]['id'] == $rr['id'])) + 'selected' => ((argv(1) != 'new') ? $selected : '') ); } |