From 28d6a124c9ac52bc952d6983a0179b8ac72e0f21 Mon Sep 17 00:00:00 2001 From: julien Date: Sat, 9 Sep 2017 15:18:47 +0200 Subject: [PATCH 1/2] [fix] fixed PluginHelper import of xtd-editors plugins --- libraries/src/Plugin/PluginHelper.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php index 10f348dc3b30c..87d60962e0756 100644 --- a/libraries/src/Plugin/PluginHelper.php +++ b/libraries/src/Plugin/PluginHelper.php @@ -259,6 +259,19 @@ protected static function import($plugin, $autocreate = true, \JEventDispatcher { $className = 'Plg' . $plugin->type . $plugin->name; + if ($plugin->type == 'editors-xtd') + { + if (!class_exists($className)) + { + $className = 'PlgEditorsXtd' . $plugin->name; + } + + if (!class_exists($className)) + { + $className = 'PlgButton' . $plugin->name; + } + } + if (class_exists($className)) { // Load the plugin from the database. From 52d0020a76438a341b7aa818736e5c05dd877597 Mon Sep 17 00:00:00 2001 From: julien Date: Sat, 9 Sep 2017 16:04:29 +0200 Subject: [PATCH 2/2] [imp] small adjustment and comment --- libraries/src/Plugin/PluginHelper.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php index 87d60962e0756..495e5ead2c07d 100644 --- a/libraries/src/Plugin/PluginHelper.php +++ b/libraries/src/Plugin/PluginHelper.php @@ -261,10 +261,8 @@ protected static function import($plugin, $autocreate = true, \JEventDispatcher if ($plugin->type == 'editors-xtd') { - if (!class_exists($className)) - { - $className = 'PlgEditorsXtd' . $plugin->name; - } + // This type doesn't follow the convention + $className = 'PlgEditorsXtd' . $plugin->name; if (!class_exists($className)) {