From fbd47c7a50932fb40cb9aace5f4f80b0b4bb635f Mon Sep 17 00:00:00 2001 From: Piotr Konieczny Date: Thu, 29 Sep 2016 13:20:36 +0200 Subject: [PATCH 1/2] Allow loading plugin language strings from extension folder --- administrator/components/com_finder/helpers/language.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php index 47f6bfb05898b..d681bdcbe6a44 100644 --- a/administrator/components/com_finder/helpers/language.php +++ b/administrator/components/com_finder/helpers/language.php @@ -116,7 +116,7 @@ public static function loadPluginLanguage() // Get array of all the enabled Smart Search plugin names. $db = JFactory::getDbo(); $query = $db->getQuery(true) - ->select('name') + ->select(array($db->qn('name'), $db->qn('element'))) ->from($db->quoteName('#__extensions')) ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) ->where($db->quoteName('folder') . ' = ' . $db->quote('finder')) @@ -136,7 +136,8 @@ public static function loadPluginLanguage() // Load language file for each plugin. foreach ($plugins as $plugin) { - $lang->load($plugin->name, JPATH_ADMINISTRATOR); + $lang->load($plugin->name, JPATH_ADMINISTRATOR) + || $lang->load($plugin->name, JPATH_SITE . '/plugins/finder/' . $plugin->element); } } } From 404f263ef80f1c01f73b84db245fb5c71dcb2597 Mon Sep 17 00:00:00 2001 From: Piotr Konieczny Date: Thu, 29 Sep 2016 14:22:20 +0200 Subject: [PATCH 2/2] Use JPATH_PLUGINS instead of JPATH_SITE --- administrator/components/com_finder/helpers/language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php index d681bdcbe6a44..3cacfce8bfdfb 100644 --- a/administrator/components/com_finder/helpers/language.php +++ b/administrator/components/com_finder/helpers/language.php @@ -137,7 +137,7 @@ public static function loadPluginLanguage() foreach ($plugins as $plugin) { $lang->load($plugin->name, JPATH_ADMINISTRATOR) - || $lang->load($plugin->name, JPATH_SITE . '/plugins/finder/' . $plugin->element); + || $lang->load($plugin->name, JPATH_PLUGINS . '/finder/' . $plugin->element); } } }