diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:35 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:35 +0100 |
| commit | 0e0c8d78199cfa2dd56a62266df33655c93367ff (patch) | |
| tree | 757d55e62f00042a60d3988ce7b09588a749bf45 /phpBB/develop | |
| parent | bae824e818fb30260385ed63e6fbea2779a3d19a (diff) | |
| parent | 4319ebbaf6d029bdbb1a9bc6c33c66e62cd486a2 (diff) | |
| download | forums-0e0c8d78199cfa2dd56a62266df33655c93367ff.tar forums-0e0c8d78199cfa2dd56a62266df33655c93367ff.tar.gz forums-0e0c8d78199cfa2dd56a62266df33655c93367ff.tar.bz2 forums-0e0c8d78199cfa2dd56a62266df33655c93367ff.tar.xz forums-0e0c8d78199cfa2dd56a62266df33655c93367ff.zip | |
Merge commit 'release-3.0-RC2'
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 6 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_tables.php | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index d3efdc45f2..d4821d0d5d 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -858,7 +858,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => array('role_id', 'auth_option_id'), 'KEYS' => array( - 'ath_opt_id' => array('INDEX', 'auth_option_id'), + 'ath_op_id' => array('INDEX', 'auth_option_id'), ), ); @@ -1256,7 +1256,7 @@ function get_schema_struct() 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', ''), + 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), 'post_attachment' => array('BOOL', 0), @@ -1643,7 +1643,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'image_id', 'KEYS' => array( - 'i_id' => array('INDEX', 'imageset_id'), + 'i_d' => array('INDEX', 'imageset_id'), ), ); diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php index ce19c2a374..047c61fd66 100644 --- a/phpBB/develop/generate_utf_tables.php +++ b/phpBB/develop/generate_utf_tables.php @@ -378,8 +378,12 @@ fclose($fp); */ $cheats = array( '00DF' => 'ss', # German sharp S + '00C5' => 'ae', # Capital A with diaeresis + '00E4' => 'ae', # Small A with diaeresis '00D6' => 'oe', # Capital O with diaeresis '00F6' => 'oe', # Small O with diaeresis + '00DC' => 'ue', # Capital U with diaeresis + '00FC' => 'ue', # Small U with diaeresis ); /** |