3.5 fix

joomla · Nov 2, 2015 · 314e578 · 314e578
1 parent 4373019
commit 314e578
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -669,10 +669,11 @@ public function onInit()
 		$elements = implode(',', $elements);
 
 		// Prepare config variables
-		$toolbar1 = implode(' ', $toolbar1_add);
-		$toolbar2 = implode(' ', $toolbar2_add);
-		$toolbar3 = implode(' ', $toolbar3_add);
-		$toolbar4 = implode(' ', $toolbar4_add);
+		$toolbar1 = implode(' ', $toolbar1_add) . ' | '
+			. implode(' ', $toolbar2_add) . ' | '
+			. implode(' ', $toolbar3_add) . ' | '
+			. implode(' ', $toolbar4_add) . ' | '
+			. implode(" | ", $btnsNames);
 		$toolbar5 = implode(" | ", $btnsNames);
 
 		// The buttons script
@@ -717,8 +718,7 @@ public function onInit()
 			theme : \"$theme\",
 			schema: \"html5\",
 			menubar: false,
-			toolbar1: \"bold italics underline strikethrough | undo redo | bullist numlist\",
-			toolbar2: \"$toolbar5 | code\",
+			toolbar1: \"bold italics underline strikethrough | undo redo | bullist numlist | $toolbar5 | code\",
 			plugins: \"$dragDropPlg code\",
 			// Cleanup/Output
 			inline_styles : true,
@@ -743,8 +743,8 @@ public function onInit()
 
 			case 1:
 			default: /* Advanced mode*/
-				$toolbar1 = "bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | formatselect | bullist numlist";
-				$toolbar2 = "outdent indent | undo redo | link unlink anchor image | hr table | subscript superscript | charmap";
+			$toolbar1 = "bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | formatselect | bullist numlist "
+				. "| outdent indent | undo redo | link unlink anchor image | hr table | subscript superscript | charmap";
 				JFactory::getDocument()->addScriptDeclaration(
 					"
 		tinyMCE.init({
@@ -769,9 +769,7 @@ public function onInit()
 			// Plugins
 			plugins : \"table link image code hr charmap autolink lists importcss $dragDropPlg\",
 			// Toolbar
-			toolbar1: \"$toolbar1\",
-			toolbar2: \"$toolbar2\",
-			toolbar3: \"$toolbar5 | code\",
+			toolbar1: \"$toolbar1 | $toolbar5 | code\",
 			removed_menuitems: \"newdocument\",
 			// URL
 			relative_urls : $relative_urls,
@@ -818,11 +816,7 @@ public function onInit()
 			// Plugins
 			plugins : \"$plugins $dragDropPlg\",
 			// Toolbar
-			toolbar1: \"$toolbar1\",
-			toolbar2: \"$toolbar2\",
-			toolbar3: \"$toolbar3\",
-			toolbar4: \"$toolbar4\",
-			toolbar5: \"$toolbar5 | code\",
+			toolbar1: \"$toolbar1 | $toolbar5 | code\",
 			removed_menuitems: \"newdocument\",
 			// URL
 			relative_urls : $relative_urls,