aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-22 13:44:34 -0800
committerfriendica <info@friendica.com>2013-12-22 13:44:34 -0800
commit30219b5bda724375c10006c33e5754d3f5d1d044 (patch)
treec5753e5afbbe3daf20d6898ec81dc78c2a787f86 /include
parentbb623fc464b777737114e953653dd4d90b7e2b3d (diff)
parent6480e14a910252f550929d3e1d7520a966dfbb09 (diff)
downloadvolse-hubzilla-30219b5bda724375c10006c33e5754d3f5d1d044.tar.gz
volse-hubzilla-30219b5bda724375c10006c33e5754d3f5d1d044.tar.bz2
volse-hubzilla-30219b5bda724375c10006c33e5754d3f5d1d044.zip
Merge pull request #249 from cvogeley/master
New modal dialog for item expiry
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
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'),
));