mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:55:19 +00:00
expires lost during edit
This commit is contained in:
parent
9ad44a2060
commit
41dc40dd84
2 changed files with 5 additions and 3 deletions
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
||||||
Copyright (c) 2010-2016 the Hubzilla Community
|
Copyright (c) 2010-2017 the Hubzilla Community
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
|
|
@ -140,6 +140,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
|
|
||||||
$item_flags = $item_restrict = 0;
|
$item_flags = $item_restrict = 0;
|
||||||
|
$expires = NULL_DATE;
|
||||||
|
|
||||||
$route = '';
|
$route = '';
|
||||||
$parent_item = null;
|
$parent_item = null;
|
||||||
|
@ -394,6 +395,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
$postopts = $orig_post['postopts'];
|
$postopts = $orig_post['postopts'];
|
||||||
$created = $orig_post['created'];
|
$created = $orig_post['created'];
|
||||||
|
$expires = $orig_post['expires'];
|
||||||
$mid = $orig_post['mid'];
|
$mid = $orig_post['mid'];
|
||||||
$parent_mid = $orig_post['parent_mid'];
|
$parent_mid = $orig_post['parent_mid'];
|
||||||
$plink = $orig_post['plink'];
|
$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(feature_enabled($profile_uid,'content_expire')) {
|
||||||
if(x($_REQUEST,'expire')) {
|
if(x($_REQUEST,'expire')) {
|
||||||
|
@ -462,7 +463,8 @@ class Item extends \Zotlabs\Web\Controller {
|
||||||
$expires = NULL_DATE;
|
$expires = NULL_DATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$mimetype = notags(trim($_REQUEST['mimetype']));
|
$mimetype = notags(trim($_REQUEST['mimetype']));
|
||||||
if(! $mimetype)
|
if(! $mimetype)
|
||||||
$mimetype = 'text/bbcode';
|
$mimetype = 'text/bbcode';
|
||||||
|
|
Loading…
Reference in a new issue