diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-01-11 22:16:19 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-01-11 22:16:19 +0100 |
| commit | bdd420a08e82ac74ccb3b879bcf79c20033fb723 (patch) | |
| tree | c3b75997c0dc87039c08622fb929277b221e8042 | |
| parent | 76daa03df075bd3350102f0984b24f5ef1ff876a (diff) | |
| parent | 62ad4dd1094905f1c55b3eb85bebce2402c990db (diff) | |
| download | volse-hubzilla-bdd420a08e82ac74ccb3b879bcf79c20033fb723.tar.gz volse-hubzilla-bdd420a08e82ac74ccb3b879bcf79c20033fb723.tar.bz2 volse-hubzilla-bdd420a08e82ac74ccb3b879bcf79c20033fb723.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2010-2016 the Hubzilla Community +Copyright (c) 2010-2017 the Hubzilla Community All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy 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'; |