respect the images root folder

joomla · Apr 2, 2017 · af9b542 · af9b542
1 parent 06dd566
commit af9b542
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -596,9 +596,10 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			// Get specific path
 			$tempPath = $levelParams->get('path', '');
 
-			if ($tempPath === '-1')
+			if (!empty($tempPath) && $tempPath !== '-1')
 			{
-				$tempPath = '';
+				// Remove the root images path
+				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
 			}
 
 			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
@@ -1869,10 +1870,10 @@ private function onDisplayLegacy($name, $content, $width, $height, $col, $row, $
 			// Get specific path
 			$tempPath = $this->params->get('path', '');
 
-			if (!empty($tempPath))
+			if (!empty($tempPath) && $tempPath !== '-1')
 			{
-				$tempPath = rtrim($tempPath, '/');
-				$tempPath = ltrim($tempPath, '/');
+				// Remove the root images path
+				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
 			}
 
 			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');