From dccd58258635d0d5cc446448659d618c345be530 Mon Sep 17 00:00:00 2001 From: Piotr Date: Tue, 18 Oct 2016 19:43:52 +0200 Subject: [PATCH] Allow loading plugin language strings from extension folder (#12403) --- 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..3cacfce8bfdfb 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_PLUGINS . '/finder/' . $plugin->element); } } }