aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-01-11 12:31:55 -0800
committerzotlabs <mike@macgirvin.com>2017-01-11 12:31:55 -0800
commit41dc40dd84388cae3e8188d8fe41f75404a8259f (patch)
tree4681fa0bce65d8145c55dfca29b26c9b208959aa /Zotlabs
parent9ad44a2060b9f294423376f1fad43fa17d1dffe4 (diff)
downloadvolse-hubzilla-41dc40dd84388cae3e8188d8fe41f75404a8259f.tar.gz
volse-hubzilla-41dc40dd84388cae3e8188d8fe41f75404a8259f.tar.bz2
volse-hubzilla-41dc40dd84388cae3e8188d8fe41f75404a8259f.zip
expires lost during edit
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Item.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index d2c16ad0f..13d0cf8c6 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -140,6 +140,7 @@ class Item extends \Zotlabs\Web\Controller {
$item_flags = $item_restrict = 0;
+ $expires = NULL_DATE;
$route = '';
$parent_item = null;
@@ -394,6 +395,7 @@ class Item extends \Zotlabs\Web\Controller {
$postopts = $orig_post['postopts'];
$created = $orig_post['created'];
+ $expires = $orig_post['expires'];
$mid = $orig_post['mid'];
$parent_mid = $orig_post['parent_mid'];
$plink = $orig_post['plink'];
@@ -453,7 +455,6 @@ class Item extends \Zotlabs\Web\Controller {
}
- $expires = NULL_DATE;
if(feature_enabled($profile_uid,'content_expire')) {
if(x($_REQUEST,'expire')) {
@@ -462,7 +463,8 @@ class Item extends \Zotlabs\Web\Controller {
$expires = NULL_DATE;
}
}
-
+
+
$mimetype = notags(trim($_REQUEST['mimetype']));
if(! $mimetype)
$mimetype = 'text/bbcode';