diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-05 15:35:05 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-05 15:35:05 -0700 |
| commit | fca8e0aa6ac9d4f2084371486e906d7e3726a5a5 (patch) | |
| tree | 81d27ea002828a42c53541f741bad44684a2c601 /Zotlabs/Widget/Conversations.php | |
| parent | 41111bcdadcd16ebc4f078fc812eb5a290f185e5 (diff) | |
| parent | 8dd9ab05a97f92f9eca5d527e48272f3a44010a8 (diff) | |
| download | volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.gz volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.bz2 volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Widget/Conversations.php')
| -rw-r--r-- | Zotlabs/Widget/Conversations.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php index 27e517c02..4fd754f66 100644 --- a/Zotlabs/Widget/Conversations.php +++ b/Zotlabs/Widget/Conversations.php @@ -12,10 +12,6 @@ class Conversations { if(argc() > 1) { switch(argv(1)) { - case 'combined': - $mailbox = 'combined'; - $header = t('Conversations'); - break; case 'inbox': $mailbox = 'inbox'; $header = t('Received Messages'); @@ -58,7 +54,7 @@ class Conversations { 'body' => $rr['body'], 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'), 'seen' => $rr['seen'], - 'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id'])) + 'selected' => ((argc() == 2) ? (intval(argv(1)) == intval($rr['id'])) : ($r[0]['id'] == $rr['id'])) ); } @@ -71,4 +67,6 @@ class Conversations { } return $o; } + } + |