diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:47:37 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:47:37 +0100 |
| commit | 031b9b7d775bbc2f88e8f2e6057b67286297042c (patch) | |
| tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /include/conversation.php | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| parent | 870df76463a1cc9823b364db0bfb387f3f46664f (diff) | |
| download | volse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.tar.gz volse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.tar.bz2 volse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.zip | |
Merge branch 'bootstrap'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 0bb13a17e..d602174b0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1142,6 +1142,8 @@ function status_editor($a,$x,$popup=false) { '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, + '$expiryModalOK' => t('OK'), + '$expiryModalCANCEL' => t('Cancel'), )); |