From e595c0841a7e63f87867e5d9d87341683a4b041e Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 29 Dec 2020 11:13:18 -0800 Subject: [PATCH] Fixes Media-Manager remote image import. --- e107_admin/image.php | 2 +- e107_tests/tests/unit/e_parseTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index 1251b3564..fec976134 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -2408,7 +2408,7 @@ class media_admin_ui extends e_admin_ui $fileName = empty($uploadCaption) ? str_replace(array(".php",".html",".asp",".htm"),'',$fileName)."_".time() : eHelper::dasherize(strtolower($uploadCaption)); } - if(!$fl->getRemoteFile($tp->filter($_POST['upload_url'], 'file'), $fileName, 'import')) + if(!$fl->getRemoteFile($tp->filter($_POST['upload_url'], 'url'), $fileName, 'import')) { $mes->addError(IMALAN_176); } diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php index 6ea6722d0..144d9173c 100644 --- a/e107_tests/tests/unit/e_parseTest.php +++ b/e107_tests/tests/unit/e_parseTest.php @@ -1270,6 +1270,7 @@ while($row = $sql->fetch()) */ public function testFilter() { + $url = 'http://www.domain.com/folder/folder2//1234_1_0.jpg'; $tests = array( 0 => array('input' => 'test123 xxx', 'mode' => 'w', 'expected' => 'test123xxx'), @@ -1278,6 +1279,7 @@ while($row = $sql->fetch()) 3 => array('input' => 'test123 xxx', 'mode' => 'wds', 'expected' => 'test123 xxx'), 4 => array('input' => 'test123 xxx.jpg', 'mode' => 'file', 'expected' => 'test123-xxx.jpg'), 5 => array('input' => '2.1.4 (test)', 'mode' => 'version', 'expected' => '2.1.4'), + 6 => array('input' => $url, 'mode'=>'url', 'expected' => $url), ); foreach($tests as $var)