diff options
| author | friendica <info@friendica.com> | 2015-02-05 19:09:42 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-05 19:09:42 -0800 |
| commit | b948fbaeda84f4358722222b4a2d5555ef10b82e (patch) | |
| tree | cae68fc40e8ad7cd7f7b2d309892d147969e597f | |
| parent | fe8a08a47482dabe1a406ca41a02dc058f25f92a (diff) | |
| download | volse-hubzilla-b948fbaeda84f4358722222b4a2d5555ef10b82e.tar.gz volse-hubzilla-b948fbaeda84f4358722222b4a2d5555ef10b82e.tar.bz2 volse-hubzilla-b948fbaeda84f4358722222b4a2d5555ef10b82e.zip | |
allow post expiration to be set from a config (and therefore a plugin/addon)
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 952d7d322..27b52ba6e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1134,6 +1134,9 @@ function status_editor($a,$x,$popup=false) { if(x($x,'nopreview')) $preview = ''; + $defexpire = ((($z = get_pconfig($x['profile_uid'],'system','default_post_expire')) && (! $webpage)) ? $z : ''); + + $cipher = get_pconfig($x['profile_uid'],'system','default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -1191,7 +1194,7 @@ function status_editor($a,$x,$popup=false) { '$preview' => $preview, '$source' => ((x($x,'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, - '$defexpire' => '', + '$defexpire' => $defexpire, '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false), '$expires' => t('Set expiration date'), '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), |