Cancel commit.

joomla · Sep 9, 2018 · 9c3835f · 9c3835f
1 parent 241570f
commit 9c3835f
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -261,20 +261,13 @@ public function onDisplay(
 		$levelParams->loadObject($toolbarParams);
 		$levelParams->loadObject($extraOptions);
 
+		// List the skins
+		$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
+
 		// Set the selected skin
 		$skin = 'lightgray';
 		$side = $app->isClient('administrator') ? 'skin_admin' : 'skin';
 
-		// List the skins
-		if ($side == 'skin_admin')
-		{
-			$skindirs = glob(JPATH_ROOT . '../media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
-		}
-		else
-		{
-			$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
-		}
-
 		if ((int) $levelParams->get($side, 0) < count($skindirs))
 		{
 			$skin = basename($skindirs[(int) $levelParams->get($side, 0)]);
@@ -1313,20 +1306,14 @@ private function onDisplayLegacy(
 		$mode     = (int) $this->params->get('mode', 1);
 		$theme    = 'modern';
 
+		// List the skins
+		$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
+
+
 		// Set the selected skin
 		$skin = 'lightgray';
 		$side = $app->isClient('administrator') ? 'skin_admin' : 'skin';
 
-		// List the skins
-		if ($side == 'skin_admin')
-		{
-			$skindirs = glob(JPATH_ROOT . '../media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
-		}
-		else
-		{
-			$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
-		}
-
 		if ((int) $this->params->get($side, 0) < count($skindirs))
 		{
 			$skin = basename($skindirs[(int) $this->params->get($side, 0)]);