diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
| commit | 73ac6b142375eaff4679a205a6bae537e4d019ac (patch) | |
| tree | 0257aa7d9985d75d5d1cd79d1bd87332e55f303c /phpBB/includes/ucp | |
| parent | 3f3db8cdaa8a8066ee0f727fe44699a179aca04e (diff) | |
| download | forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.gz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.bz2 forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.xz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.zip | |
- some bugfixes
- set ip_check to A.B.C. by default
- display postings in other encodings by default and present link to force the encoding as usual.
git-svn-id: file:///svn/phpbb/trunk@6198 89ea8834-ac86-4346-8a33-228a782c2dd0
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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 527c48efa7..ff8df44148 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -61,7 +61,7 @@ class ucp_prefs $var_ary = array( 'dateformat' => array('string', false, 3, 30), - 'lang' => array('match', false, '#^[a-z_]{2,}$#i'), + 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), 'tz' => array('num', false, -14, 14), ); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 693a785c8f..4379658959 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -125,7 +125,7 @@ class ucp_register 'email_confirm' => array('string', false, 6, 60), 'confirm_code' => array('string', !$config['enable_confirm'], 5, 8), 'tz' => array('num', false, -14, 14), - 'lang' => array('match', false, '#^[a-z_]{2,}$#i'), + 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), ); $error = validate_data($data, $var_ary); |