diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-17 17:21:10 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-17 17:21:10 -0700 |
| commit | 9f35971860e35a70162e469d7812c14ff949bf98 (patch) | |
| tree | 621b3a34395bfce3a6d6ebc883dcc9a70921d0f3 /include | |
| parent | 3d99a6b5c4b8d754dff0666f7cca84724e0f95d9 (diff) | |
| parent | c02ff823f6b84cda431f6ca39701c88d22607b77 (diff) | |
| download | volse-hubzilla-9f35971860e35a70162e469d7812c14ff949bf98.tar.gz volse-hubzilla-9f35971860e35a70162e469d7812c14ff949bf98.tar.bz2 volse-hubzilla-9f35971860e35a70162e469d7812c14ff949bf98.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index cdb7807b6..5ae2250a8 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1233,7 +1233,8 @@ function status_editor($a, $x, $popup = false) { '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, '$expiryModalOK' => t('OK'), - '$expiryModalCANCEL' => t('Cancel') + '$expiryModalCANCEL' => t('Cancel'), + '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), )); if ($popup === true) { |