DRY

plugins/editors/tinymce/field/uploaddirs.php

@@ -76,6 +76,12 @@ protected function getInput()
 		// Get the field options.
 		$options = (array) $this->getOptions();
 
+		// Reset the non selected value to null
+		if ($options[0]->value === '-1')
+		{
+			$options[0]->value = '';
+		}
+
 		// Create a regular list.
 		$html[] = JHtml::_('select.genericlist', $options, $this->name, '', 'value', 'text', $this->value, $this->id);
 

plugins/editors/tinymce/tinymce.php

@@ -596,17 +596,12 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			// Get specific path
 			$tempPath = $levelParams->get('path', '');
 
-			if ($dragdrop && !empty($tempPath) && $tempPath !== '-1')
+			if (!empty($tempPath))
 			{
 				// 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;
@@ -1875,17 +1870,12 @@ private function onDisplayLegacy($name, $content, $width, $height, $col, $row, $
 			// Get specific path
 			$tempPath = $this->params->get('path', '');
 
-			if ($dragdrop && !empty($tempPath) && $tempPath === '-1')
+			if (!empty($tempPath))
 			{
 				// 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;