Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions administrator/components/com_finder/src/Helper/LanguageHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\LanguageHelper as CMSLanguageHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Plugin\PluginHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand Down Expand Up @@ -123,16 +124,8 @@ public static function loadPluginLanguage()

$loaded = true;

// Get array of all the enabled Smart Search plugin names.
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select([$db->quoteName('name'), $db->quoteName('element')])
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
->where($db->quoteName('folder') . ' = ' . $db->quote('finder'))
->where($db->quoteName('enabled') . ' = 1');
$db->setQuery($query);
$plugins = $db->loadObjectList();
// Get array of all the enabled Smart Search plugins.
$plugins = PluginHelper::getPlugin('finder');

if (empty($plugins)) {
return;
Expand All @@ -144,8 +137,9 @@ 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_PLUGINS . '/finder/' . $plugin->element);
$extension = 'plg_finder_' . $plugin->name;
$lang->load($extension, JPATH_ADMINISTRATOR)
|| $lang->load($extension, JPATH_PLUGINS . '/finder/' . $plugin->name);
}
}
}