respect the default value

joomla · Apr 2, 2017 · eb79dbf · eb79dbf
1 parent af9b542
commit eb79dbf
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -596,12 +596,17 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			// Get specific path
 			$tempPath = $levelParams->get('path', '');
 
-			if (!empty($tempPath) && $tempPath !== '-1')
+			if ($dragdrop && !empty($tempPath) && $tempPath !== '-1')
 			{
 				// Remove the root images path
 				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
 			}
 
+			if (isset($tempPath) && $tempPath === '-1')
+			{
+				$tempPath = '';
+			}
+
 			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
 
 			$scriptOptions['setCustomDir']    = $isSubDir;
@@ -1870,12 +1875,17 @@ private function onDisplayLegacy($name, $content, $width, $height, $col, $row, $
 			// Get specific path
 			$tempPath = $this->params->get('path', '');
 
-			if (!empty($tempPath) && $tempPath !== '-1')
+			if ($dragdrop && !empty($tempPath) && $tempPath === '-1')
 			{
 				// Remove the root images path
 				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
 			}
 
+			if (isset($tempPath) && $tempPath !== '-1')
+			{
+				$tempPath = '';
+			}
+
 			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
 
 			$scriptOptions['setCustomDir']    = $isSubDir;