diff --git a/ChangeLog b/ChangeLog index 9e5f2e852..d56677849 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,21 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-07-17 Alexander M. Turek + * libraries/database_interface.lib.php, libraries/dbi/*.dbi.lib.php: + moved redundant post-connect code into database_interface.lib.php. + * libraries/url_generating.lib.php: Added ability to skip certain hidden + input fields. + * libraries/database_interface.lib.php: Added new function for retreiving + MySQL variables. + * libraries/mysql_charsets.lib.php: Added optional onchange-submit feature + to collation dropdown box. + * main.php, lang/*.inc.php, libraries/database_interface.lib.php, + libraries/url_generating.lib.php: The user may now choose his connection + character set. This should fix bug #984912. + WARNING: The pmadb needs to be converted to UTF-8 now! + TODO: Handle non-UTF-8 pmadb more nicely. + 2004-07-16 Marc Delisle * index.php: left frame display problems under IE diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php index 7ebf7c961..1edfb9f0a 100644 --- a/lang/afrikaans-iso-8859-1.inc.php +++ b/lang/afrikaans-iso-8859-1.inc.php @@ -730,4 +730,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index e0e08e7c4..76ba21c52 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -731,4 +731,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php index 558ed9c44..1b3e5cb0d 100644 --- a/lang/albanian-iso-8859-1.inc.php +++ b/lang/albanian-iso-8859-1.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 847628012..a55b5f543 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 0ab324f03..63d636274 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -724,4 +724,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php index 111672251..372ecd872 100644 --- a/lang/arabic-windows-1256.inc.php +++ b/lang/arabic-windows-1256.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php index 52cd0be6a..814b5b5a3 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php +++ b/lang/azerbaijani-iso-8859-9.inc.php @@ -719,4 +719,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index c0f9d8ab8..08b239311 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php index 2197dfa29..7550ad6e9 100644 --- a/lang/basque-iso-8859-1.inc.php +++ b/lang/basque-iso-8859-1.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 22fdaf3e0..a073a079c 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index cdda362ea..a88c5f2ea 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -729,4 +729,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php index 21259c081..9ea1aa83a 100644 --- a/lang/bosnian-windows-1250.inc.php +++ b/lang/bosnian-windows-1250.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php index 9cf3cbe00..a54014815 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php @@ -744,4 +744,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index b070009da..c2396e59d 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -745,4 +745,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php index 08eb87a18..7fc1559dc 100644 --- a/lang/bulgarian-koi8-r.inc.php +++ b/lang/bulgarian-koi8-r.inc.php @@ -727,4 +727,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 181e98a5c..d7bb525d2 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php index 42becc279..5cdf84a67 100644 --- a/lang/bulgarian-windows-1251.inc.php +++ b/lang/bulgarian-windows-1251.inc.php @@ -727,4 +727,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php index b06c52a90..ed85bab85 100644 --- a/lang/catalan-iso-8859-1.inc.php +++ b/lang/catalan-iso-8859-1.inc.php @@ -715,4 +715,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 48f130d2e..465a40b21 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php b/lang/chinese_big5-utf-8.inc.php index 5f99c2c82..9985fdee2 100644 --- a/lang/chinese_big5-utf-8.inc.php +++ b/lang/chinese_big5-utf-8.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/chinese_big5.inc.php b/lang/chinese_big5.inc.php index ef6482ac7..f9df7d7ff 100644 --- a/lang/chinese_big5.inc.php +++ b/lang/chinese_big5.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php b/lang/chinese_gb-utf-8.inc.php index 11e6c5aef..eadd0a565 100644 --- a/lang/chinese_gb-utf-8.inc.php +++ b/lang/chinese_gb-utf-8.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/chinese_gb.inc.php b/lang/chinese_gb.inc.php index 32f204383..5c0ea868a 100644 --- a/lang/chinese_gb.inc.php +++ b/lang/chinese_gb.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php index f9842c109..6184919f2 100644 --- a/lang/croatian-iso-8859-2.inc.php +++ b/lang/croatian-iso-8859-2.inc.php @@ -743,4 +743,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index c4a9f7ac0..f7549a1f1 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -744,4 +744,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php index 09ee4958b..f48245087 100644 --- a/lang/croatian-windows-1250.inc.php +++ b/lang/croatian-windows-1250.inc.php @@ -743,4 +743,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php index cce095534..27b24a3e0 100644 --- a/lang/czech-iso-8859-2.inc.php +++ b/lang/czech-iso-8859-2.inc.php @@ -721,4 +721,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení.'; $strZip = '"zazipováno"'; +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 8861a87c9..20eb34230 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -722,4 +722,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: NastavenĂ­ tÄ›chto parametrĹŻ na 0 (nulu) odstranĂ­ omezenĂ­.'; $strZip = '"zazipováno"'; +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php index 82e24d433..6f5e7ab83 100644 --- a/lang/czech-windows-1250.inc.php +++ b/lang/czech-windows-1250.inc.php @@ -721,4 +721,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení.'; $strZip = '"zazipováno"'; +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php index dc0404823..d740b1729 100644 --- a/lang/danish-iso-8859-1.inc.php +++ b/lang/danish-iso-8859-1.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index c9ad72389..9b1ffd935 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -718,4 +718,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index ba2e3d7d0..64880dd9f 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -719,4 +719,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 07cb074cb..4eaf05ba2 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php index 1868172d7..a80ad60a5 100644 --- a/lang/english-iso-8859-1.inc.php +++ b/lang/english-iso-8859-1.inc.php @@ -364,6 +364,7 @@ $strMoveTableSameNames = 'Can\'t move table to same one!'; $strMultilingual = 'multilingual'; $strMustSelectFile = 'You should select file which you want to insert.'; $strMySQLCharset = 'MySQL charset'; +$strMySQLConnectionCollation = 'MySQL connection collation'; $strMySQLReloaded = 'MySQL reloaded.'; $strMySQLSaid = 'MySQL said: '; $strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 8b37e6143..781cad595 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -365,6 +365,7 @@ $strMoveTableSameNames = 'Can\'t move table to same one!'; $strMultilingual = 'multilingual'; $strMustSelectFile = 'You should select file which you want to insert.'; $strMySQLCharset = 'MySQL charset'; +$strMySQLConnectionCollation = 'MySQL connection collation'; $strMySQLReloaded = 'MySQL reloaded.'; $strMySQLSaid = 'MySQL said: '; $strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%'; diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php index b4d98a3e1..f1a47c82d 100644 --- a/lang/estonian-iso-8859-1.inc.php +++ b/lang/estonian-iso-8859-1.inc.php @@ -715,4 +715,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 35c6e054a..4ab52149b 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php index 7fc1d3458..1ff496a7d 100644 --- a/lang/finnish-iso-8859-1.inc.php +++ b/lang/finnish-iso-8859-1.inc.php @@ -740,4 +740,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 6e6c08273..89ef28a9b 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -741,4 +741,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php index 9dee52291..2129a3240 100644 --- a/lang/french-iso-8859-1.inc.php +++ b/lang/french-iso-8859-1.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 244d929a1..69c575d26 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php index dd813a6f3..d88837104 100644 --- a/lang/galician-iso-8859-1.inc.php +++ b/lang/galician-iso-8859-1.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 2645d322b..c50689819 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 659ea7abf..84c3a8537 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -744,4 +744,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php index 91772e7a7..6ffe3b59c 100644 --- a/lang/german-iso-8859-1.inc.php +++ b/lang/german-iso-8859-1.inc.php @@ -372,6 +372,7 @@ $strMoveTableSameNames = 'Tabelle kann nicht mit gleichem Namen verschoben werde $strMultilingual = 'multilingual'; $strMustSelectFile = 'Bitte geben Sie eine Datei an, die eingefügt werden soll.'; $strMySQLCharset = 'MySQL-Zeichensatz'; +$strMySQLConnectionCollation = 'Zeichensatz / Sortierung der MySQL-Verbindung'; $strMySQLReloaded = 'Die MySQL-Benutzertabellen wurden neu geladen.'; $strMySQLSaid = 'MySQL meldet: '; $strMySQLServerProcess = 'Verbunden mit MySQL %pma_s1% auf %pma_s2% als %pma_s3%'; diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 638daa431..dba57cce4 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -373,6 +373,7 @@ $strMoveTableSameNames = 'Tabelle kann nicht mit gleichem Namen verschoben werde $strMultilingual = 'multilingual'; $strMustSelectFile = 'Bitte geben Sie eine Datei an, die eingefĂĽgt werden soll.'; $strMySQLCharset = 'MySQL-Zeichensatz'; +$strMySQLConnectionCollation = 'Zeichensatz / Sortierung der MySQL-Verbindung'; $strMySQLReloaded = 'Die MySQL-Benutzertabellen wurden neu geladen.'; $strMySQLSaid = 'MySQL meldet: '; $strMySQLServerProcess = 'Verbunden mit MySQL %pma_s1% auf %pma_s2% als %pma_s3%'; diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php index 66379cc25..51e9728ef 100644 --- a/lang/greek-iso-8859-7.inc.php +++ b/lang/greek-iso-8859-7.inc.php @@ -724,4 +724,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index f7635fd82..f2c789576 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -725,4 +725,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php index fcb8f54a2..58a882287 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php +++ b/lang/hebrew-iso-8859-8-i.inc.php @@ -740,4 +740,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 8807e8314..efb4dff48 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -748,4 +748,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php index e9b8555af..f81de840b 100644 --- a/lang/hungarian-iso-8859-2.inc.php +++ b/lang/hungarian-iso-8859-2.inc.php @@ -719,4 +719,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index dd635d84e..658fe50d4 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -719,4 +719,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php index 07b0b817b..66ec4cba5 100644 --- a/lang/indonesian-iso-8859-1.inc.php +++ b/lang/indonesian-iso-8859-1.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index a438cb780..927e7c9c9 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php index 9a3a01894..282525307 100644 --- a/lang/italian-iso-8859-1.inc.php +++ b/lang/italian-iso-8859-1.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 6446d1940..0279e7c66 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php index 6918c8978..d826aea28 100644 --- a/lang/japanese-euc.inc.php +++ b/lang/japanese-euc.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index e4bb6d25b..8d9557f26 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 89fa5d289..76274771b 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -729,4 +729,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php index 2ade1f8a9..4aef4b659 100644 --- a/lang/korean-euc-kr.inc.php +++ b/lang/korean-euc-kr.inc.php @@ -738,4 +738,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index eb2a729d3..b2d9cfa87 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -739,4 +739,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 3e326718d..436fc8092 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php index c52d7e414..edb687f1d 100644 --- a/lang/latvian-windows-1257.inc.php +++ b/lang/latvian-windows-1257.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index c8dab1ec3..3c4d567bc 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php index dbbceeca5..52a3a1827 100644 --- a/lang/lithuanian-windows-1257.inc.php +++ b/lang/lithuanian-windows-1257.inc.php @@ -715,4 +715,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php index 26ef04df2..2938cd137 100644 --- a/lang/malay-iso-8859-1.inc.php +++ b/lang/malay-iso-8859-1.inc.php @@ -739,4 +739,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index b0e637d16..010972c47 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -740,4 +740,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php index b2432da15..276910ee2 100644 --- a/lang/norwegian-iso-8859-1.inc.php +++ b/lang/norwegian-iso-8859-1.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 70ebac483..51e5f4655 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 4f8b029ed..e1333de01 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -746,4 +746,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php index 67f20c2b9..934007f85 100644 --- a/lang/persian-windows-1256.inc.php +++ b/lang/persian-windows-1256.inc.php @@ -745,4 +745,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php index 3ac4a17a3..cb56db252 100644 --- a/lang/polish-iso-8859-2.inc.php +++ b/lang/polish-iso-8859-2.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 2cb7d8763..451d89cd9 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -724,4 +724,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php index 1ebfd13d0..8051e69ea 100644 --- a/lang/portuguese-iso-8859-1.inc.php +++ b/lang/portuguese-iso-8859-1.inc.php @@ -735,4 +735,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 7267f01ba..59fe2386e 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -736,4 +736,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php index 10256c92d..61469e1d8 100644 --- a/lang/romanian-iso-8859-1.inc.php +++ b/lang/romanian-iso-8859-1.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 8c2909437..eff890e14 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php index 61cdbf255..12a9eb687 100644 --- a/lang/russian-cp-866.inc.php +++ b/lang/russian-cp-866.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php index 573fa0a2a..dd069dd2a 100644 --- a/lang/russian-koi8-r.inc.php +++ b/lang/russian-koi8-r.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index ffc937787..c464f1143 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -724,4 +724,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php index 94d26757a..3298eeb55 100644 --- a/lang/russian-windows-1251.inc.php +++ b/lang/russian-windows-1251.inc.php @@ -723,4 +723,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 54b38b7d6..399bd9a7b 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php index 9857399b2..ffc1480d0 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php +++ b/lang/serbian_cyrillic-windows-1251.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 880109590..0b29873a3 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -722,4 +722,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php index 589de8075..81ecc3114 100644 --- a/lang/serbian_latin-windows-1250.inc.php +++ b/lang/serbian_latin-windows-1250.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php index e0bfed653..a0756bdb8 100644 --- a/lang/slovak-iso-8859-2.inc.php +++ b/lang/slovak-iso-8859-2.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index c89f21b8e..b4aac122c 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -718,4 +718,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php index 1e2c9f323..f774c2b3d 100644 --- a/lang/slovak-windows-1250.inc.php +++ b/lang/slovak-windows-1250.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php index 865912626..7bb4d420c 100644 --- a/lang/slovenian-iso-8859-2.inc.php +++ b/lang/slovenian-iso-8859-2.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 390f6dfb4..c49618e08 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -718,4 +718,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php index bbab779b5..dfa3591c4 100644 --- a/lang/slovenian-windows-1250.inc.php +++ b/lang/slovenian-windows-1250.inc.php @@ -717,4 +717,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php index 58f4a0c28..710f96084 100644 --- a/lang/spanish-iso-8859-1.inc.php +++ b/lang/spanish-iso-8859-1.inc.php @@ -715,4 +715,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 6a1b89620..695c5b324 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php index ab1ad5f38..5203dc50e 100644 --- a/lang/swedish-iso-8859-1.inc.php +++ b/lang/swedish-iso-8859-1.inc.php @@ -715,4 +715,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index d2c873ef1..f3d7f0663 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -716,4 +716,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php index ca9b355c0..8f860e593 100644 --- a/lang/thai-tis-620.inc.php +++ b/lang/thai-tis-620.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index fe5f2e801..482097f6e 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -729,4 +729,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php index 54f9ff111..26646e19b 100644 --- a/lang/turkish-iso-8859-9.inc.php +++ b/lang/turkish-iso-8859-9.inc.php @@ -728,4 +728,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 93eb1de4e..2eda4643a 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -729,4 +729,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 2c799cc26..1fa0f1a16 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -721,4 +721,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php index 91cdd3dfb..d557cc015 100644 --- a/lang/ukrainian-windows-1251.inc.php +++ b/lang/ukrainian-windows-1251.inc.php @@ -720,4 +720,5 @@ $strRomanian = 'Romanian'; //to translate $strSlovenian = 'Slovenian'; //to translate $strTraditionalSpanish = 'Traditional Spanish'; //to translate $strSlovak = 'Slovak'; //to translate +$strMySQLConnectionCollation = 'MySQL connection collation'; //to translate ?> diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a6fba6eaf..9daeb6e5e 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -5,8 +5,12 @@ /** * Common Option Constants For DBI Functions */ +// PMA_DBI_try_query() define('PMA_DBI_QUERY_STORE', 1); // Force STORE_RESULT method, ignored by classic MySQL. define('PMA_DBI_QUERY_UNBUFFERED', 2); // Do not read whole query +// PMA_DBI_get_variable() +define('PMA_DBI_GETVAR_SESSION', 1); +define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Including The DBI Plugin @@ -18,8 +22,7 @@ require_once('./libraries/dbi/' . $cfg['Server']['extension'] . '.dbi.lib.php'); */ function PMA_DBI_query($query, $link = NULL, $options = 0) { $res = PMA_DBI_try_query($query, $link, $options) - or PMA_mysqlDie(PMA_DBI_getError(), $query); - + or PMA_mysqlDie(PMA_DBI_getError($link), $query); return $res; } @@ -80,4 +83,70 @@ function PMA_DBI_get_fields($database, $table, $link = NULL) { return $fields; } +function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = NULL) { + if ($link === NULL) { + if (isset($GLOBALS['userlink'])) { + $link = $GLOBALS['userlink']; + } else { + return FALSE; + } + } + if (PMA_MYSQL_INT_VERSION < 40002) { + $type = 0; + } + switch ($type) { + case PMA_DBI_GETVAR_SESSION: + $modifier = ' SESSION'; + break; + case PMA_DBI_GETVAR_GLOBAL: + $modifier = ' GLOBAL'; + break; + default: + $modifier = ''; + } + $res = PMA_DBI_query('SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', $link); + $row = PMA_DBI_fetch_row($res); + PMA_DBI_free_result($res); + if (empty($row)) { + return FALSE; + } else { + return $row[0] == $var ? $row[1] : FALSE; + } +} + +function PMA_DBI_postConnect($link) { + global $collation_connection; + if (!defined('PMA_MYSQL_INT_VERSION')) { + $result = PMA_DBI_query('SELECT VERSION() AS version', $link, PMA_DBI_QUERY_STORE); + if ($result != FALSE && @PMA_DBI_num_rows($result) > 0) { + $row = PMA_DBI_fetch_row($result); + $match = explode('.', $row[0]); + PMA_DBI_free_result($result); + } + if (!isset($row)) { + define('PMA_MYSQL_INT_VERSION', 32332); + define('PMA_MYSQL_STR_VERSION', '3.23.32'); + } else{ + define('PMA_MYSQL_INT_VERSION', (int)sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2]))); + define('PMA_MYSQL_STR_VERSION', $row[0]); + unset($result, $row, $match); + } + } + + if (PMA_MYSQL_INT_VERSION >= 40100) { + $mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']]; + if (empty($collation_connection) || (strpos('_', $collation_connection) ? substr($collation_connection, 0, strpos('_', $collation_connection)) : $collation_connection) == $mysql_charset) { + PMA_DBI_query('SET NAMES ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE); + } else { + PMA_DBI_query('SET CHARACTER SET ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE); + } + if (!empty($collation_connection)) { + PMA_DBI_query('SET collation_connection = \'' . $collation_connection . '\';', $link, PMA_DBI_QUERY_STORE); + } + $collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link); + } else { + require_once('./libraries/charset_conversion.lib.php'); + } +} + ?> diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 5cbfbd4af..19086f2bf 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -65,30 +65,8 @@ function PMA_DBI_connect($user, $password) { if (empty($link)) { PMA_auth_fails(); } // end if - - if (!defined('PMA_MYSQL_INT_VERSION')) { - $result = mysql_query('SELECT VERSION() AS version', $link); - if ($result != FALSE && @mysql_num_rows($result) > 0) { - $row = mysql_fetch_row($result); - $match = explode('.', $row[0]); - mysql_free_result($result); - } - if (!isset($row)) { - define('PMA_MYSQL_INT_VERSION', 32332); - define('PMA_MYSQL_STR_VERSION', '3.23.32'); - } else{ - define('PMA_MYSQL_INT_VERSION', (int)sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2]))); - define('PMA_MYSQL_STR_VERSION', $row[0]); - unset($result, $row, $match); - } - } - - if (PMA_MYSQL_INT_VERSION >= 40100) { - $mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']]; - mysql_query('SET CHARACTER SET ' . $mysql_charset . ';', $link); - } else { - require_once('./libraries/charset_conversion.lib.php'); - } + + PMA_DBI_postConnect($link); return $link; } @@ -115,7 +93,7 @@ function PMA_DBI_try_query($query, $link = NULL, $options = 0) { return FALSE; } } - if (PMA_MYSQL_INT_VERSION < 40100) { + if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 40100) { $query = PMA_convert_charset($query); } if ($options == ($options | PMA_DBI_QUERY_STORE)) { @@ -141,7 +119,7 @@ function PMA_mysql_fetch_array($result, $type = FALSE) { /* No data returned => do not touch it */ if (! $data) return $data; - if (PMA_MYSQL_INT_VERSION >= 40100 + if (!defined('PMA_MYSQL_INT_VERSION') || PMA_MYSQL_INT_VERSION >= 40100 || !(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) { /* No recoding -> return data as we got them */ return $data; diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 102101e45..a7093d672 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -54,29 +54,7 @@ function PMA_DBI_connect($user, $password) { PMA_auth_fails(); } // end if - if (!defined('PMA_MYSQL_INT_VERSION')) { - $result = mysqli_query($link, 'SELECT VERSION() AS version;', MYSQLI_STORE_RESULT); - if ($result != FALSE && @mysqli_num_rows($result) > 0) { - $row = mysqli_fetch_row($result); - $match = explode('.', $row[0]); - mysqli_free_result($result); - } - if (!isset($row)) { - define('PMA_MYSQL_INT_VERSION', 32332); - define('PMA_MYSQL_STR_VERSION', '3.23.32'); - } else{ - define('PMA_MYSQL_INT_VERSION', (int)sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2]))); - define('PMA_MYSQL_STR_VERSION', $row[0]); - unset($result, $row, $match); - } - } - - if (PMA_MYSQL_INT_VERSION >= 40100) { - $mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']]; - mysqli_query($link, 'SET CHARACTER SET ' . $mysql_charset . ';', MYSQLI_STORE_RESULT); - } else { - require_once('./libraries/charset_conversion.lib.php'); - } + PMA_DBI_postConnect($link); return $link; } @@ -111,7 +89,7 @@ function PMA_DBI_try_query($query, $link = NULL, $options = 0) { return FALSE; } } - if (PMA_MYSQL_INT_VERSION < 40100) { + if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 40100) { $query = PMA_convert_charset($query); } return mysqli_query($link, $query, $method); @@ -131,7 +109,7 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) { /* No data returned => do not touch it */ if (! $data) return $data; - if (PMA_MYSQL_INT_VERSION >= 40100 + if (!defined('PMA_MYSQL_INT_VERSION') || PMA_MYSQL_INT_VERSION >= 40100 || !(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) { /* No recoding -> return data as we got them */ return $data; diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index d8ee08ea0..7f918d48f 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -285,7 +285,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){ define('PMA_CSDROPDOWN_COLLATION', 0); define('PMA_CSDROPDOWN_CHARSET', 1); - function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, $name = NULL, $id = NULL, $default = NULL, $label = TRUE, $indent = 0) { + function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, $name = NULL, $id = NULL, $default = NULL, $label = TRUE, $indent = 0, $submitOnChange = FALSE) { global $mysql_charsets, $mysql_charsets_descriptions, $mysql_collations; if (empty($name)) { @@ -299,7 +299,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){ $spacer = ''; for ($i = 1; $i <= $indent; $i++) $spacer .= ' '; - $return_str = $spacer . '' . "\n"; if ($label) { $return_str .= $spacer . ' ' . "\n"; } diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 6c230d975..8fd94dcd0 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -19,6 +19,7 @@ * * @global string the current language * @global string the current conversion charset + * @global string the current connection collation * @global string the current server * @global array the configuration array * @global boolean whether recoding is allowed or not @@ -27,10 +28,14 @@ * * @author nijel */ -function PMA_generate_common_hidden_inputs ($db = '', $table = '', $indent = 0) +function PMA_generate_common_hidden_inputs ($db = '', $table = '', $indent = 0, $skip = array()) { - global $lang, $convcharset, $server; + global $lang, $convcharset, $collation_connection, $server; global $cfg, $allow_recoding; + + if (!is_array($skip)) { + $skip = array($skip); + } $spaces = ''; for ($i = 0; $i < $indent; $i++) { @@ -39,11 +44,13 @@ function PMA_generate_common_hidden_inputs ($db = '', $table = '', $indent = 0) $result = $spaces . '' . "\n" . $spaces . '' . "\n"; - if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) + if (!in_array('convcharset', $skip) && isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) $result .= $spaces . '' . "\n"; - if (!empty($db)) + if (!in_array('collation_connection', $skip) && isset($collation_connection)) + $result .= $spaces . '' . "\n"; + if (!in_array('db', $skip) && !empty($db)) $result .= $spaces . '' . "\n"; - if (!empty($table)) + if (!in_array('table', $skip) && !empty($table)) $result .= $spaces . '' . "\n"; return $result; } @@ -60,6 +67,7 @@ function PMA_generate_common_hidden_inputs ($db = '', $table = '', $indent = 0) * * @global string the current language * @global string the current conversion charset + * @global string the current connection collation * @global string the current server * @global array the configuration array * @global boolean whether recoding is allowed or not @@ -70,13 +78,15 @@ function PMA_generate_common_hidden_inputs ($db = '', $table = '', $indent = 0) */ function PMA_generate_common_url ($db = '', $table = '', $amp = '&') { - global $lang, $convcharset, $server; + global $lang, $convcharset, $collation_connection, $server; global $cfg, $allow_recoding; $result = 'lang=' . $lang . $amp . 'server=' . $server; if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) - $result .= $amp . 'convcharset=' . $convcharset; + $result .= $amp . 'convcharset=' . urlencode($convcharset); + if (isset($collation_connection)) + $result .= $amp . 'collation_connection=' . urlencode($collation_connection); if (!empty($db)) $result .= $amp . 'db='.urlencode($db); if (!empty($table)) diff --git a/main.php b/main.php index ff0dad4b4..a9b08ccff 100644 --- a/main.php +++ b/main.php @@ -22,6 +22,7 @@ setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https); if (isset($convcharset)) { setcookie('pma_charset', $convcharset, time() + 60*60*24*30, $cookie_path, '', $is_https); } + /** * Includes the ThemeManager */ @@ -572,10 +573,25 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] .' ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'','s_asci.png',$strMySQLCharset,'') : $str_normal_list) . "\n" . ' ' . "\n" . ' ' . $strMySQLCharset . ': ' - . ' ' + . ' ' . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" - . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + .' ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'','s_asci.png',$strMySQLCharset,'') : $str_normal_list) . "\n" + . ' ' . "\n" + . '
' . "\n" + . PMA_generate_common_hidden_inputs(NULL, NULL, 4, 'collation_connection') + . ' ' . "\n" + . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, TRUE, 4, TRUE) + . ' ' . "\n" + . '
' . "\n" + . ' ' . "\n" . ' ' . "\n"; } echo "\n";