Use the url for drag and drop in TinyMCE (#36687)

joomla · Jan 25, 2022 · ac81c31 · ac81c31
1 parent 661fd26
commit ac81c31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/administrator/components/com_media/src/Controller/ApiController.php b/administrator/components/com_media/src/Controller/ApiController.php
@@ -221,7 +221,10 @@ public function postFiles()
 			$name = $this->getModel()->createFolder($adapter, $name, $path, $override);
 		}
 
-		return $this->getModel()->getFile($adapter, $path . '/' . $name);
+		$options        = [];
+		$options['url'] = $this->input->getBool('url', false);
+
+		return $this->getModel()->getFile($adapter, $path . '/' . $name, $options);
 	}
 
 	/**

diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
@@ -53,10 +53,10 @@
               var _Joomla$getOptions = Joomla.getOptions('system.paths'),
                   rootFull = _Joomla$getOptions.rootFull;
 
-              urlPath = "" + response.data.thumb_path.split(rootFull)[1];
-            } else if (responseData.thumb_path) {
+              urlPath = "" + response.data.url.split(rootFull)[1];
+            } else if (responseData.url) {
               // Absolute path for different domain
-              urlPath = responseData.thumb_path;
+              urlPath = responseData.url;
             }
 
             var dialogClose = function dialogClose(api) {

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -531,7 +531,7 @@ public function onDisplay(
 		if ($dragdrop && $user->authorise('core.create', 'com_media'))
 		{
 			$externalPlugins['jdragndrop'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/dragdrop/plugin.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]);
-			$uploadUrl                     = Uri::base(false) . 'index.php?option=com_media&format=json&task=api.files';
+			$uploadUrl                     = Uri::base(false) . 'index.php?option=com_media&format=json&url=1&task=api.files';
 
 			if ($this->app->isClient('site'))
 			{