From de4932d6dafcfe0dc4beedc0c72f4e99786fd4c7 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 1 Sep 2015 15:53:48 -0700 Subject: [PATCH] Newspost - inline editing was resetting datestamp. Imported media via URL now strips queries from filename. --- e107_admin/image.php | 6 ++++++ e107_admin/newspost.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index 872886641..463d9e062 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1585,6 +1585,12 @@ class media_admin_ui extends e_admin_ui if(vartrue($_POST['upload_remote_url'])) { $fileName = basename($_POST['upload_url']); + + if(strpos($fileName,'?')!==false) + { + list($fileName,$bla) = explode("?", $fileName); + } + if(!$fl->getRemoteFile($_POST['upload_url'], $fileName, 'import')) { $mes->addError("There was a problem grabbing the file"); diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 5e2ca0c5f..0c5a806e5 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -470,7 +470,7 @@ class news_admin_ui extends e_admin_ui $new_data['news_thumbnail'] = $this->processThumbs($new_data['news_thumbnail']); } - if(empty($new_data['news_datestamp'])) + if(isset($new_data['news_datestamp']) && empty($new_data['news_datestamp'])) { $new_data['news_datestamp'] = time(); }