aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_language.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-10-29 23:04:18 +0200
committerJoas Schilling <nickvergessen@gmx.de>2011-11-17 10:28:16 +0100
commitb2b057910e57961b3d31432267fadb4ddc922783 (patch)
treed0719a86ee2c21848475d3d060b9d9e065197d61 /phpBB/includes/acp/acp_language.php
parent86f8851c403bb9f31b43a9656e844e5c925da19a (diff)
downloadforums-b2b057910e57961b3d31432267fadb4ddc922783.tar
forums-b2b057910e57961b3d31432267fadb4ddc922783.tar.gz
forums-b2b057910e57961b3d31432267fadb4ddc922783.tar.bz2
forums-b2b057910e57961b3d31432267fadb4ddc922783.tar.xz
forums-b2b057910e57961b3d31432267fadb4ddc922783.zip
[ticket/10157] Add notification to update cpfs when installing a language.
We currently just copy the language-strings from the default language. But the admin should be reminded to change them. PHPBB3-10157
Diffstat (limited to 'phpBB/includes/acp/acp_language.php')
-rw-r--r--phpBB/includes/acp/acp_language.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 598b390302..d560cdd0c5 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -919,6 +919,9 @@ class acp_language
$default_lang_id = (int) $db->sql_fetchfield('lang_id');
$db->sql_freeresult($result);
+ // We want to notify the admin that custom profile fields need to be updated for the new language.
+ $notify_cpf_update = false;
+
// From the mysql documentation:
// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
// Due to this we stay on the safe side if we do the insertion "the manual way"
@@ -932,6 +935,7 @@ class acp_language
{
$row['lang_id'] = $lang_id;
$db->sql_query('INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+ $notify_cpf_update = true;
}
$db->sql_freeresult($result);
@@ -944,12 +948,15 @@ class acp_language
{
$row['lang_id'] = $lang_id;
$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+ $notify_cpf_update = true;
}
$db->sql_freeresult($result);
add_log('admin', 'LOG_LANGUAGE_PACK_INSTALLED', $lang_pack['name']);
- trigger_error(sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']) . adm_back_link($this->u_action));
+ $message = sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']);
+ $message .= ($notify_cpf_update) ? '<br /><br />' . $user->lang['LANGUAGE_PACK_CPF_UPDATE'] : '';
+ trigger_error($message . adm_back_link($this->u_action));
break;