Missing Editor breaks the script

joomla · Nov 4, 2015 · 1f43f48 · 1f43f48
1 parent 7abe00f
commit 1f43f48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -19,6 +19,7 @@
 $trashed   = $this->state->get('filter.state') == -2 ? true : false;
 $canOrder  = $user->authorise('core.edit.state', 'com_modules');
 $saveOrder = $listOrder == 'ordering';
+$editor    = JFactory::getApplication()->input->get('editor', '');
 
 if ($saveOrder)
 {
@@ -46,12 +47,12 @@
 		};
 
 		moduleIns = function(type, name) {
-			parent.window.jInsertEditorText("{loadmodule " + type + "," + name + "," + jQuery("#extra_class").val() + "}");
+			parent.window.jInsertEditorText("{loadmodule " + type + "," + name + "," + jQuery("#extra_class").val() + "}", "' . $editor . '");
 			parent.window.jModalClose();
 		}
 
 		modulePosIns = function(position) {
-			parent.window.jInsertEditorText("{loadposition " + position + "," + jQuery("#extra_class").val() + "}");
+			parent.window.jInsertEditorText("{loadposition " + position + "," + jQuery("#extra_class").val() + "}", "' . $editor . '");
 			parent.window.jModalClose();
 		}
 ');

diff --git a/plugins/editors-xtd/module/module.php b/plugins/editors-xtd/module/module.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * Editor Module buton
+ * Editor Module button
  *
  * @since  3.5
  */
@@ -30,13 +30,13 @@ class PlgButtonModule extends JPlugin
 	 * @since  3.5
 	 * @return array
 	 */
-	public function onDisplay()
+	public function onDisplay($name)
 	{
 		/*
 		 * Use the built-in element view to select the module.
 		 * Currently uses blank class.
 		 */
-		$link = 'index.php?option=com_modules&amp;view=modules&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$link = 'index.php?option=com_modules&amp;view=modules&amp;layout=modal&amp;tmpl=component&amp;editor=' . $name . '&amp;' . JSession::getFormToken() . '=1';
 
 		$button = new JObject;
 		$button->modal = true;