diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-11 21:55:46 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-11 21:55:46 -0500 |
| commit | df096b6b52f9198561d689b505a8c74a0d0f86b6 (patch) | |
| tree | 4adba820df1420e71fca9022df93dfeddcd9b9cc /phpBB/includes/ucp | |
| parent | db70d613bcdca69be7b634d742ec79dc3f9725de (diff) | |
| parent | 2f57bfb6f297e9711bacb607faf6e33ab516db33 (diff) | |
| download | forums-df096b6b52f9198561d689b505a8c74a0d0f86b6.tar forums-df096b6b52f9198561d689b505a8c74a0d0f86b6.tar.gz forums-df096b6b52f9198561d689b505a8c74a0d0f86b6.tar.bz2 forums-df096b6b52f9198561d689b505a8c74a0d0f86b6.tar.xz forums-df096b6b52f9198561d689b505a8c74a0d0f86b6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9970] Rename validate_language() to validate_language_iso_name().
[ticket/9970] Do not allow switching to languages not installed on reg. page.
[ticket/9970] Check whether language pack is installed.
[ticket/9970] User language input is checked for existance
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index b1f96356d5..51262c2289 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -65,7 +65,7 @@ class ucp_prefs $error = validate_data($data, array( 'dateformat' => array('string', false, 1, 30), - 'lang' => array('match', false, '#^[a-z0-9_\-]{2,}$#i'), + 'lang' => array('language_iso_name'), 'tz' => array('num', false, -14, 14), )); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index eaad4a7093..71374a9381 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -57,7 +57,7 @@ class ucp_register { $use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang); - if (file_exists($user->lang_path . $use_lang . '/')) + if (!validate_language_iso_name($use_lang)) { if ($change_lang) { @@ -211,7 +211,7 @@ class ucp_register array('email')), 'email_confirm' => array('string', false, 6, 60), 'tz' => array('num', false, -14, 14), - 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), + 'lang' => array('language_iso_name'), )); if (!check_form_key('ucp_register')) |