Skip to content

Commit 874f59c

Browse files
committed
Setitngs: Language: Fix PlatformLanguage visualization when on multi-URL configuration - refs #6030
1 parent 27178cd commit 874f59c

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

main/admin/languages.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,7 @@
264264
$result_select = Database::query($sql_select);
265265

266266
$current_access_url = api_get_current_access_url_id();
267-
$sql_select_lang = "SELECT * FROM $tbl_settings_current
268-
WHERE category='Languages'
269-
AND access_url = $current_access_url";
270-
271-
$result_select_lang = Database::query($sql_select_lang);
272-
$row_lang = Database::fetch_array($result_select_lang);
267+
$platformLanguage = api_get_setting('platformLanguage');
273268

274269
// the table data
275270
$language_data = [];
@@ -279,7 +274,7 @@
279274
// the first column is the original name of the language OR a form containing the original name
280275
if ($action == 'edit' and $row['id'] == $_GET['id']) {
281276
$checked = '';
282-
if ($row['english_name'] == api_get_setting('platformLanguage')) {
277+
if ($row['english_name'] == $platformLanguage) {
283278
$checked = ' checked="checked" ';
284279
}
285280

@@ -295,7 +290,7 @@
295290
// the third column
296291
$row_td[] = $row['dokeos_folder'];
297292

298-
if ($row['english_name'] == $row_lang['selected_value']) {
293+
if ($row['english_name'] == $platformLanguage) {
299294
$setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'), '', ICON_SIZE_SMALL);
300295
} else {
301296
$setplatformlanguage = "<a href=\"javascript:if (confirm('".addslashes(get_lang('AreYouSureYouWantToSetThisLanguageAsThePortalDefault'))."')) { location.href='".api_get_self()."?action=setplatformlanguage&id=".$row['id']."'; }\">".Display::return_icon('languages_na.png', get_lang('SetLanguageAsDefault'), '', ICON_SIZE_SMALL)."</a>";
@@ -326,7 +321,7 @@
326321
$allow_add_term_sub_language = '';
327322
}
328323

329-
if ($row['english_name'] == $row_lang['selected_value']) {
324+
if ($row['english_name'] == $platformLanguage) {
330325
$row_td[] = Display::return_icon('visible.png', get_lang('Visible'))."<a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>
331326
&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
332327
} else {

0 commit comments

Comments
 (0)