diff -r phpmyadmin/CREDITS phpmyadmin2/CREDITS
1c1
< $Id: CREDITS 5152 2003-11-18 15:20:45Z nijel $
---
> $Id$
diff -r phpmyadmin/ChangeLog phpmyadmin2/ChangeLog
5c5
< $Id: ChangeLog 13152 2009-12-07 17:13:18Z lem9 $
---
> $Id$
7a8,25
> 2.11.11.3 (2011-02-11)
> - [security] SQL injection, see PMASA-2011-2
> 
> 2.11.11.2 (2011-02-08)
> - [security] Path disclosure, see PMASA-2011-1
> 
> 2.11.11.1 (2010-11-29)
> - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
> 
> 2.11.11.0 (2010-09-07)
> - [core] Fix broken cleanup of $_GET
> - bug #3054458 [core] Fixed displaying number of rows.
> 
> 2.11.10.1 (2010-08-20)
> - [setup] Fixed output sanitizing in setup script, see PMASA-2010-4 for
>   more details.
> - [core] Fixed various XSS issues, see PMASA-2010-5 for more details.
> 
diff -r phpmyadmin/Documentation.html phpmyadmin2/Documentation.html
5c5
< <!-- $Id: Documentation.html 13152 2009-12-07 17:13:18Z lem9 $ -->
---
> <!-- $Id$ -->
14c14
<     <title>phpMyAdmin 2.11.10 - Documentation</title>
---
>     <title>phpMyAdmin 2.11.11.3 - Documentation</title>
36c36
< <h1>phpMyAdmin 2.11.10 Documentation</h1>
---
> <h1>phpMyAdmin 2.11.11.3 Documentation</h1>
51c51
<         <i>$Id: Documentation.html 13152 2009-12-07 17:13:18Z lem9 $</i>
---
>         <i>$Id$</i>
diff -r phpmyadmin/Documentation.txt phpmyadmin2/Documentation.txt
14c14
< phpMyAdmin 2.11.10 Documentation
---
> phpMyAdmin 2.11.11.3 Documentation
23,24c23
<   * Documentation version: $Id: Documentation.html 13152 2009-12-07 17:13:18Z
<     lem9 $
---
>   * Documentation version: $Id$
diff -r phpmyadmin/INSTALL phpmyadmin2/INSTALL
1c1
< $Id: INSTALL 9537 2006-10-12 16:27:13Z nijel $
---
> $Id$
diff -r phpmyadmin/README phpmyadmin2/README
1c1
< $Id: README 13152 2009-12-07 17:13:18Z lem9 $
---
> $Id$
8,9c8,9
<   Version 2.11.10
<   ---------------
---
>   Version 2.11.11.3
>   -----------------
13c13
<     Copyright (C) 2001-2009 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
---
>     Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info>
phpmyadmin¤À¤±¤Ëȯ¸«: RELEASE-DATE-2.11.10
phpmyadmin2¤À¤±¤Ëȯ¸«: RELEASE-DATE-2.11.11.3
diff -r phpmyadmin/TODO phpmyadmin2/TODO
1c1
< $Id: TODO 9537 2006-10-12 16:27:13Z nijel $
---
> $Id$
diff -r phpmyadmin/browse_foreigners.php phpmyadmin2/browse_foreigners.php
6c6
<  * @version $Id: browse_foreigners.php 11035 2008-01-05 13:33:05Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/calendar.php phpmyadmin2/calendar.php
5c5
<  * @version $Id: calendar.php 10474 2007-07-08 17:39:06Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/changelog.php phpmyadmin2/changelog.php
6c6
<  * @version $Id: changelog.php 10561 2007-08-17 20:52:07Z lem9 $
---
>  * @version $Id$
9c9,17
< $changelog = htmlspecialchars(file_get_contents('ChangeLog'));
---
> $filename = 'ChangeLog';
> 
> // Check if the file is available, some distributions remove these.
> if (is_readable($filename)) {
>     $changelog = htmlspecialchars(file_get_contents($filename));
> } else {
>     echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
>     exit;
> }
diff -r phpmyadmin/chk_rel.php phpmyadmin2/chk_rel.php
5c5
<  * @version $Id: chk_rel.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/config.sample.inc.php phpmyadmin2/config.sample.inc.php
10c10
<  * @version $Id: config.sample.inc.php 12304 2009-03-24 12:56:58Z nijel $
---
>  * @version $Id$
diff -r phpmyadmin/contrib/README phpmyadmin2/contrib/README
1c1
< $Id: README 8657 2006-02-22 15:35:00Z nijel $
---
> $Id$
diff -r phpmyadmin/db_create.php phpmyadmin2/db_create.php
5c5
<  * @version $Id: db_create.php 11402 2008-07-15 18:42:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_datadict.php phpmyadmin2/db_datadict.php
5c5
<  * @version $Id: db_datadict.php 11334 2008-06-21 13:16:05Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_export.php phpmyadmin2/db_export.php
6c6
<  * @version $Id: db_export.php 10541 2007-08-01 16:44:32Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_import.php phpmyadmin2/db_import.php
5c5
<  * @version $Id: db_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/db_operations.php phpmyadmin2/db_operations.php
12c12
<  * @version $Id: db_operations.php 13034 2009-10-12 21:47:40Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_printview.php phpmyadmin2/db_printview.php
5c5
<  * @version $Id: db_printview.php 11334 2008-06-21 13:16:05Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_qbe.php phpmyadmin2/db_qbe.php
6c6
<  * @version $Id: db_qbe.php 10588 2007-09-02 19:23:59Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_search.php phpmyadmin2/db_search.php
48c48
<  * @version $Id: db_search.php 10958 2007-12-04 18:07:16Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/db_sql.php phpmyadmin2/db_sql.php
5c5
<  * @version $Id: db_sql.php 10965 2007-12-05 17:53:52Z lem9 $
---
>  * @version $Id$
39c39
< PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';');
---
> PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';');
diff -r phpmyadmin/db_structure.php phpmyadmin2/db_structure.php
5c5
<  * @version $Id: db_structure.php 11244 2008-05-08 01:30:22Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/docs.css phpmyadmin2/docs.css
1c1
< /* $Id: docs.css 9263 2006-08-09 17:35:20Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/error.php phpmyadmin2/error.php
6c6
<  * @version $Id: error.php 10289 2007-04-16 13:32:45Z cybot_tm $
---
>  * @version $Id$
76,77c76,81
< if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
<     echo PMA_sanitize(stripslashes($_REQUEST['error']));
---
> if (!empty($_REQUEST['error'])) {
>     if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
>         echo PMA_sanitize(stripslashes($_REQUEST['error']));
>     } else {
>         echo PMA_sanitize($_REQUEST['error']);
>     }
79c83
<     echo PMA_sanitize($_REQUEST['error']);
---
>     echo 'No error message!';
diff -r phpmyadmin/export.php phpmyadmin2/export.php
5c5
<  * @version $Id: export.php 11450 2008-08-01 19:15:01Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/import.php phpmyadmin2/import.php
6c6
<  * @version $Id: import.php 10398 2007-05-15 11:16:10Z cybot_tm $
---
>  * @version $Id$
134a135
>     $id_bookmark = (int)$id_bookmark;
diff -r phpmyadmin/index.php phpmyadmin2/index.php
6c6
<  * @version $Id: index.php 11402 2008-07-15 18:42:50Z lem9 $
---
>  * @version $Id$
70c70
<     if (! array_key_exists($each_drop, $_GET)) {
---
>     if (array_key_exists($each_drop, $_GET)) {
diff -r phpmyadmin/js/functions.js phpmyadmin2/js/functions.js
5c5
<  * @version $Id: functions.js 10964 2007-12-05 17:01:48Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/js/indexes.js phpmyadmin2/js/indexes.js
5c5
<  * @version $Id: indexes.js 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/js/querywindow.js phpmyadmin2/js/querywindow.js
5c5
<  * @version $Id: querywindow.js 11402 2008-07-15 18:42:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/js/server_privileges.js phpmyadmin2/js/server_privileges.js
5c5
<  * @version $Id: server_privileges.js 10929 2007-11-15 17:51:46Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/js/tbl_change.js phpmyadmin2/js/tbl_change.js
5c5
<  * @version $Id: tbl_change.js 10474 2007-07-08 17:39:06Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/js/tooltip.js phpmyadmin2/js/tooltip.js
6c6
<  * @version $Id: tooltip.js 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/js/user_password.js phpmyadmin2/js/user_password.js
5c5
<  * @version $Id: user_password.js 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
phpmyadmin¤À¤±¤Ëȯ¸«: kir_version
phpmyadmin2¤À¤±¤Ëȯ¸«: kir_version_phpMyAdmin
diff -r phpmyadmin/lang/add_message.sh phpmyadmin2/lang/add_message.sh
2c2
< # $Id: add_message.sh 9537 2006-10-12 16:27:13Z nijel $
---
> # $Id$
diff -r phpmyadmin/lang/add_message_file.sh phpmyadmin2/lang/add_message_file.sh
2c2
< # $Id: add_message_file.sh 7364 2005-09-24 08:49:52Z nijel $
---
> # $Id$
diff -r phpmyadmin/lang/afrikaans-iso-8859-1.inc.php phpmyadmin2/lang/afrikaans-iso-8859-1.inc.php
2c2
< /* $Id: afrikaans-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/afrikaans-utf-8.inc.php phpmyadmin2/lang/afrikaans-utf-8.inc.php
2c2
< /* $Id: afrikaans-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/albanian-iso-8859-1.inc.php phpmyadmin2/lang/albanian-iso-8859-1.inc.php
2c2
< /* $Id: albanian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/albanian-utf-8.inc.php phpmyadmin2/lang/albanian-utf-8.inc.php
2c2
< /* $Id: albanian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/arabic-utf-8.inc.php phpmyadmin2/lang/arabic-utf-8.inc.php
2c2
< /* $Id: arabic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/arabic-windows-1256.inc.php phpmyadmin2/lang/arabic-windows-1256.inc.php
2c2
< /* $Id: arabic-windows-1256.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/azerbaijani-iso-8859-9.inc.php phpmyadmin2/lang/azerbaijani-iso-8859-9.inc.php
2c2
< /* $Id: azerbaijani-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/azerbaijani-utf-8.inc.php phpmyadmin2/lang/azerbaijani-utf-8.inc.php
2c2
< /* $Id: azerbaijani-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/basque-iso-8859-1.inc.php phpmyadmin2/lang/basque-iso-8859-1.inc.php
2c2
< /* $Id: basque-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/basque-utf-8.inc.php phpmyadmin2/lang/basque-utf-8.inc.php
2c2
< /* $Id: basque-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/belarusian_cyrillic-utf-8.inc.php phpmyadmin2/lang/belarusian_cyrillic-utf-8.inc.php
2c2
< /* $Id: belarusian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/belarusian_cyrillic-windows-1251.inc.php phpmyadmin2/lang/belarusian_cyrillic-windows-1251.inc.php
2c2
< /* $Id: belarusian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/belarusian_latin-utf-8.inc.php phpmyadmin2/lang/belarusian_latin-utf-8.inc.php
2c2
< /* $Id: belarusian_latin-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/bosnian-utf-8.inc.php phpmyadmin2/lang/bosnian-utf-8.inc.php
2c2
< /* $Id: bosnian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/bosnian-windows-1250.inc.php phpmyadmin2/lang/bosnian-windows-1250.inc.php
2c2
< /* $Id: bosnian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php phpmyadmin2/lang/brazilian_portuguese-iso-8859-1.inc.php
2c2
< /* $Id: brazilian_portuguese-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/brazilian_portuguese-utf-8.inc.php phpmyadmin2/lang/brazilian_portuguese-utf-8.inc.php
2c2
< /* $Id: brazilian_portuguese-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/bulgarian-koi8-r.inc.php phpmyadmin2/lang/bulgarian-koi8-r.inc.php
2c2
< /* $Id: bulgarian-koi8-r.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/bulgarian-utf-8.inc.php phpmyadmin2/lang/bulgarian-utf-8.inc.php
2c2
< /* $Id: bulgarian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/bulgarian-windows-1251.inc.php phpmyadmin2/lang/bulgarian-windows-1251.inc.php
2c2
< /* $Id: bulgarian-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/catalan-iso-8859-1.inc.php phpmyadmin2/lang/catalan-iso-8859-1.inc.php
2c2
< /* $Id: catalan-iso-8859-1.inc.php 11159 2008-03-07 17:59:01Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/catalan-utf-8.inc.php phpmyadmin2/lang/catalan-utf-8.inc.php
2c2
< /* $Id: catalan-utf-8.inc.php 11159 2008-03-07 17:59:01Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/check_lang.sh phpmyadmin2/lang/check_lang.sh
2c2
< # $Id: check_lang.sh 9393 2006-09-08 11:28:23Z lem9 $
---
> # $Id$
diff -r phpmyadmin/lang/chinese_simplified-gb2312.inc.php phpmyadmin2/lang/chinese_simplified-gb2312.inc.php
2c2
< /* $Id: chinese_simplified-gb2312.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/chinese_simplified-utf-8.inc.php phpmyadmin2/lang/chinese_simplified-utf-8.inc.php
2c2
< /* $Id: chinese_simplified-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/chinese_traditional-big5.inc.php phpmyadmin2/lang/chinese_traditional-big5.inc.php
2c2
< /* $Id: chinese_traditional-big5.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/chinese_traditional-utf-8.inc.php phpmyadmin2/lang/chinese_traditional-utf-8.inc.php
2c2
< /* $Id: chinese_traditional-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/croatian-iso-8859-2.inc.php phpmyadmin2/lang/croatian-iso-8859-2.inc.php
2c2
< /* $Id: croatian-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/croatian-utf-8.inc.php phpmyadmin2/lang/croatian-utf-8.inc.php
2c2
< /* $Id: croatian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/croatian-windows-1250.inc.php phpmyadmin2/lang/croatian-windows-1250.inc.php
2c2
< /* $Id: croatian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/czech-iso-8859-2.inc.php phpmyadmin2/lang/czech-iso-8859-2.inc.php
2c2
< /* $Id: czech-iso-8859-2.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/czech-utf-8.inc.php phpmyadmin2/lang/czech-utf-8.inc.php
2c2
< /* $Id: czech-utf-8.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/czech-windows-1250.inc.php phpmyadmin2/lang/czech-windows-1250.inc.php
2c2
< /* $Id: czech-windows-1250.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/danish-iso-8859-1.inc.php phpmyadmin2/lang/danish-iso-8859-1.inc.php
2c2
< /* $Id: danish-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
---
> /* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
diff -r phpmyadmin/lang/danish-utf-8.inc.php phpmyadmin2/lang/danish-utf-8.inc.php
2c2
< /* $Id: danish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
---
> /* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
diff -r phpmyadmin/lang/dutch-iso-8859-1.inc.php phpmyadmin2/lang/dutch-iso-8859-1.inc.php
2c2
< /* $Id: dutch-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/dutch-iso-8859-15.inc.php phpmyadmin2/lang/dutch-iso-8859-15.inc.php
2c2
< /* $Id: dutch-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/dutch-utf-8.inc.php phpmyadmin2/lang/dutch-utf-8.inc.php
2c2
< /* $Id: dutch-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/english-iso-8859-1.inc.php phpmyadmin2/lang/english-iso-8859-1.inc.php
2c2
< /* $Id: english-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/english-iso-8859-15.inc.php phpmyadmin2/lang/english-iso-8859-15.inc.php
2c2
< /* $Id: english-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/english-utf-8.inc.php phpmyadmin2/lang/english-utf-8.inc.php
2c2
< /* $Id: english-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/estonian-iso-8859-1.inc.php phpmyadmin2/lang/estonian-iso-8859-1.inc.php
2c2
< /* $Id: estonian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/estonian-utf-8.inc.php phpmyadmin2/lang/estonian-utf-8.inc.php
2c2
< /* $Id: estonian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/finnish-iso-8859-1.inc.php phpmyadmin2/lang/finnish-iso-8859-1.inc.php
2c2
< /* $Id: finnish-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/finnish-iso-8859-15.inc.php phpmyadmin2/lang/finnish-iso-8859-15.inc.php
2c2
< /* $Id: finnish-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/finnish-utf-8.inc.php phpmyadmin2/lang/finnish-utf-8.inc.php
2c2
< /* $Id: finnish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/french-iso-8859-1.inc.php phpmyadmin2/lang/french-iso-8859-1.inc.php
2c2
< /* $Id: french-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/french-iso-8859-15.inc.php phpmyadmin2/lang/french-iso-8859-15.inc.php
2c2
< /* $Id: french-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/french-utf-8.inc.php phpmyadmin2/lang/french-utf-8.inc.php
2c2
< /* $Id: french-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/galician-iso-8859-1.inc.php phpmyadmin2/lang/galician-iso-8859-1.inc.php
2c2
< /* $Id: galician-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/galician-utf-8.inc.php phpmyadmin2/lang/galician-utf-8.inc.php
2c2
< /* $Id: galician-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/georgian-utf-8.inc.php phpmyadmin2/lang/georgian-utf-8.inc.php
2c2
< /* $Id: georgian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/german-iso-8859-1.inc.php phpmyadmin2/lang/german-iso-8859-1.inc.php
11c11
<  * $Id: german-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $
---
>  * $Id$
diff -r phpmyadmin/lang/german-iso-8859-15.inc.php phpmyadmin2/lang/german-iso-8859-15.inc.php
11c11
<  * $Id: german-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $
---
>  * $Id$
diff -r phpmyadmin/lang/german-utf-8.inc.php phpmyadmin2/lang/german-utf-8.inc.php
11c11
<  * $Id: german-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $
---
>  * $Id$
diff -r phpmyadmin/lang/greek-iso-8859-7.inc.php phpmyadmin2/lang/greek-iso-8859-7.inc.php
2c2
< /* $Id: greek-iso-8859-7.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/greek-utf-8.inc.php phpmyadmin2/lang/greek-utf-8.inc.php
2c2
< /* $Id: greek-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/hebrew-iso-8859-8-i.inc.php phpmyadmin2/lang/hebrew-iso-8859-8-i.inc.php
2c2
< /* $Id: hebrew-iso-8859-8-i.inc.php 11113 2008-02-09 16:09:54Z lem9 $ 
---
> /* $Id$ 
diff -r phpmyadmin/lang/hebrew-utf-8.inc.php phpmyadmin2/lang/hebrew-utf-8.inc.php
2c2
< /* $Id: hebrew-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ 
---
> /* $Id$ 
diff -r phpmyadmin/lang/hindi-utf-8.inc.php phpmyadmin2/lang/hindi-utf-8.inc.php
2c2
< /* $Id: hindi-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/indonesian-iso-8859-1.inc.php phpmyadmin2/lang/indonesian-iso-8859-1.inc.php
2c2
< /* $Id: indonesian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/indonesian-utf-8.inc.php phpmyadmin2/lang/indonesian-utf-8.inc.php
2c2
< /* $Id: indonesian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/italian-iso-8859-1.inc.php phpmyadmin2/lang/italian-iso-8859-1.inc.php
2c2
< /* $Id: italian-iso-8859-1.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/italian-iso-8859-15.inc.php phpmyadmin2/lang/italian-iso-8859-15.inc.php
2c2
< /* $Id: italian-iso-8859-15.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/italian-utf-8.inc.php phpmyadmin2/lang/italian-utf-8.inc.php
2c2
< /* $Id: italian-utf-8.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/japanese-euc.inc.php phpmyadmin2/lang/japanese-euc.inc.php
2c2
< /* $Id: japanese-euc.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/japanese-sjis.inc.php phpmyadmin2/lang/japanese-sjis.inc.php
2c2
< /* $Id: japanese-sjis.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/japanese-utf-8.inc.php phpmyadmin2/lang/japanese-utf-8.inc.php
2c2
< /* $Id: japanese-utf-8.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/korean-euc-kr.inc.php phpmyadmin2/lang/korean-euc-kr.inc.php
2c2
< /* $Id: korean-euc-kr.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/korean-utf-8.inc.php phpmyadmin2/lang/korean-utf-8.inc.php
2c2
< /* $Id: korean-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/latvian-utf-8.inc.php phpmyadmin2/lang/latvian-utf-8.inc.php
2c2
< /* $Id: latvian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/latvian-windows-1257.inc.php phpmyadmin2/lang/latvian-windows-1257.inc.php
2c2
< /* $Id: latvian-windows-1257.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/lithuanian-utf-8.inc.php phpmyadmin2/lang/lithuanian-utf-8.inc.php
2c2
< /* $Id: lithuanian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/lithuanian-windows-1257.inc.php phpmyadmin2/lang/lithuanian-windows-1257.inc.php
2c2
< /* $Id: lithuanian-windows-1257.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/macedonian_cyrillic-utf-8.inc.php phpmyadmin2/lang/macedonian_cyrillic-utf-8.inc.php
2c2
< /* $Id: macedonian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/macedonian_cyrillic-windows-1251.inc.php phpmyadmin2/lang/macedonian_cyrillic-windows-1251.inc.php
2c2
< /* $Id: macedonian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/malay-iso-8859-1.inc.php phpmyadmin2/lang/malay-iso-8859-1.inc.php
2c2
< /* $Id: malay-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/malay-utf-8.inc.php phpmyadmin2/lang/malay-utf-8.inc.php
2c2
< /* $Id: malay-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/mongolian-utf-8.inc.php phpmyadmin2/lang/mongolian-utf-8.inc.php
2c2
< /* $Id: mongolian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/norwegian-iso-8859-1.inc.php phpmyadmin2/lang/norwegian-iso-8859-1.inc.php
2c2
< /* $Id: norwegian-iso-8859-1.inc.php 11434 2008-07-25 20:41:14Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/norwegian-utf-8.inc.php phpmyadmin2/lang/norwegian-utf-8.inc.php
2c2
< /* $Id: norwegian-utf-8.inc.php 11508 2008-08-26 16:33:00Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/persian-utf-8.inc.php phpmyadmin2/lang/persian-utf-8.inc.php
3c3
< /* $Id: persian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/persian-windows-1256.inc.php phpmyadmin2/lang/persian-windows-1256.inc.php
3c3
< /* $Id: persian-windows-1256.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/polish-iso-8859-2.inc.php phpmyadmin2/lang/polish-iso-8859-2.inc.php
2c2
< /* $Id: polish-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/polish-utf-8.inc.php phpmyadmin2/lang/polish-utf-8.inc.php
2c2
< /* $Id: polish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/polish-windows-1250.inc.php phpmyadmin2/lang/polish-windows-1250.inc.php
2c2
< /* $Id: polish-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/portuguese-iso-8859-1.inc.php phpmyadmin2/lang/portuguese-iso-8859-1.inc.php
2c2
< /* $Id: portuguese-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/portuguese-iso-8859-15.inc.php phpmyadmin2/lang/portuguese-iso-8859-15.inc.php
2c2
< /* $Id: portuguese-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/portuguese-utf-8.inc.php phpmyadmin2/lang/portuguese-utf-8.inc.php
2c2
< /* $Id: portuguese-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/remove_message.sh phpmyadmin2/lang/remove_message.sh
2c2
< # $Id: remove_message.sh 5152 2003-11-18 15:20:45Z nijel $
---
> # $Id$
diff -r phpmyadmin/lang/romanian-iso-8859-1.inc.php phpmyadmin2/lang/romanian-iso-8859-1.inc.php
2c2
< /* $Id: romanian-iso-8859-1.inc.php 11213 2008-04-23 17:13:43Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/romanian-utf-8.inc.php phpmyadmin2/lang/romanian-utf-8.inc.php
2c2
< /* $Id: romanian-utf-8.inc.php 11213 2008-04-23 17:13:43Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/russian-cp-866.inc.php phpmyadmin2/lang/russian-cp-866.inc.php
2c2
< /* $Id: russian-cp-866.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/russian-koi8-r.inc.php phpmyadmin2/lang/russian-koi8-r.inc.php
2c2
< /* $Id: russian-koi8-r.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/russian-utf-8.inc.php phpmyadmin2/lang/russian-utf-8.inc.php
2c2
< /* $Id: russian-utf-8.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/russian-windows-1251.inc.php phpmyadmin2/lang/russian-windows-1251.inc.php
2c2
< /* $Id: russian-windows-1251.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/serbian_cyrillic-utf-8.inc.php phpmyadmin2/lang/serbian_cyrillic-utf-8.inc.php
2c2
< /* $Id: serbian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/serbian_cyrillic-windows-1251.inc.php phpmyadmin2/lang/serbian_cyrillic-windows-1251.inc.php
2c2
< /* $Id: serbian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/serbian_latin-utf-8.inc.php phpmyadmin2/lang/serbian_latin-utf-8.inc.php
2c2
< /* $Id: serbian_latin-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/serbian_latin-windows-1250.inc.php phpmyadmin2/lang/serbian_latin-windows-1250.inc.php
2c2
< /* $Id: serbian_latin-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/sinhala-utf-8.inc.php phpmyadmin2/lang/sinhala-utf-8.inc.php
2c2
< /* $Id: sinhala-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovak-iso-8859-2.inc.php phpmyadmin2/lang/slovak-iso-8859-2.inc.php
2c2
< /* $Id: slovak-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovak-utf-8.inc.php phpmyadmin2/lang/slovak-utf-8.inc.php
2c2
< /* $Id: slovak-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovak-windows-1250.inc.php phpmyadmin2/lang/slovak-windows-1250.inc.php
2c2
< /* $Id: slovak-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovenian-iso-8859-2.inc.php phpmyadmin2/lang/slovenian-iso-8859-2.inc.php
2c2
< /* $Id: slovenian-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovenian-utf-8.inc.php phpmyadmin2/lang/slovenian-utf-8.inc.php
2c2
< /* $Id: slovenian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/slovenian-windows-1250.inc.php phpmyadmin2/lang/slovenian-windows-1250.inc.php
2c2
< /* $Id: slovenian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/sort_lang.sh phpmyadmin2/lang/sort_lang.sh
2c2
< # $Id: sort_lang.sh 5206 2003-11-26 20:42:58Z nijel $
---
> # $Id$
33c33
<     CVSID='/\* \$Id: sort_lang.sh 5206 2003-11-26 20:42:58Z nijel $ \*/'
---
>     CVSID='/\* \$Id$ \*/'
diff -r phpmyadmin/lang/spanish-iso-8859-1.inc.php phpmyadmin2/lang/spanish-iso-8859-1.inc.php
2c2
< /* $Id: spanish-iso-8859-1.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/spanish-iso-8859-15.inc.php phpmyadmin2/lang/spanish-iso-8859-15.inc.php
2c2
< /* $Id: spanish-iso-8859-15.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/spanish-utf-8.inc.php phpmyadmin2/lang/spanish-utf-8.inc.php
2c2
< /* $Id: spanish-utf-8.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/swedish-iso-8859-1.inc.php phpmyadmin2/lang/swedish-iso-8859-1.inc.php
2c2
< /* $Id: swedish-iso-8859-1.inc.php 11124 2008-02-13 17:32:43Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/swedish-utf-8.inc.php phpmyadmin2/lang/swedish-utf-8.inc.php
2c2
< /* $Id: swedish-utf-8.inc.php 11186 2008-04-05 14:39:19Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/sync_lang.sh phpmyadmin2/lang/sync_lang.sh
2c2
< # $Id: sync_lang.sh 11213 2008-04-23 17:13:43Z lem9 $
---
> # $Id$
diff -r phpmyadmin/lang/tatarish-iso-8859-9.inc.php phpmyadmin2/lang/tatarish-iso-8859-9.inc.php
2c2
< /* $Id: tatarish-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/tatarish-utf-8.inc.php phpmyadmin2/lang/tatarish-utf-8.inc.php
2c2
< /* $Id: tatarish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/thai-tis-620.inc.php phpmyadmin2/lang/thai-tis-620.inc.php
2c2
< /* $Id: thai-tis-620.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/thai-utf-8.inc.php phpmyadmin2/lang/thai-utf-8.inc.php
2c2
< /* $Id: thai-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/translatecount.sh phpmyadmin2/lang/translatecount.sh
2c2
< # $Id: translatecount.sh 5152 2003-11-18 15:20:45Z nijel $
---
> # $Id$
diff -r phpmyadmin/lang/turkish-iso-8859-9.inc.php phpmyadmin2/lang/turkish-iso-8859-9.inc.php
2c2
< /* $Id: turkish-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/turkish-utf-8.inc.php phpmyadmin2/lang/turkish-utf-8.inc.php
2c2
< /* $Id: turkish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/ukrainian-utf-8.inc.php phpmyadmin2/lang/ukrainian-utf-8.inc.php
2c2
< /* $Id: ukrainian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/lang/ukrainian-windows-1251.inc.php phpmyadmin2/lang/ukrainian-windows-1251.inc.php
2c2
< /* $Id: ukrainian-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
---
> /* $Id$ */
diff -r phpmyadmin/libraries/Config.class.php phpmyadmin2/libraries/Config.class.php
6c6
<  * @version $Id: Config.class.php 13152 2009-12-07 17:13:18Z lem9 $
---
>  * @version $Id$
88c88
<         $this->set('PMA_VERSION', '2.11.10');
---
>         $this->set('PMA_VERSION', '2.11.11.3');
diff -r phpmyadmin/libraries/File.class.php phpmyadmin2/libraries/File.class.php
6c6
<  * @version $Id: File.class.php 11536 2008-09-02 17:35:48Z nijel $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/List.class.php phpmyadmin2/libraries/List.class.php
6c6
<  * @version $Id: List.class.php 10786 2007-10-14 12:23:22Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/List_Database.class.php phpmyadmin2/libraries/List_Database.class.php
6c6
<  * @version $Id: List_Database.class.php 10913 2007-11-09 21:24:40Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/StorageEngine.class.php phpmyadmin2/libraries/StorageEngine.class.php
6c6
<  * @version $Id: StorageEngine.class.php 10654 2007-09-20 16:25:32Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/Table.class.php phpmyadmin2/libraries/Table.class.php
5c5
<  * @version $Id: Table.class.php 11353 2008-06-27 14:27:18Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/Theme.class.php phpmyadmin2/libraries/Theme.class.php
6c6
<  * @version $Id: Theme.class.php 11035 2008-01-05 13:33:05Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/Theme_Manager.class.php phpmyadmin2/libraries/Theme_Manager.class.php
5c5
<  * @version $Id: Theme_Manager.class.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/auth/config.auth.lib.php phpmyadmin2/libraries/auth/config.auth.lib.php
6c6
<  * @version $Id: config.auth.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/auth/cookie.auth.lib.php phpmyadmin2/libraries/auth/cookie.auth.lib.php
8c8
<  * @version $Id: cookie.auth.lib.php 11449 2008-08-01 19:00:36Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/auth/http.auth.lib.php phpmyadmin2/libraries/auth/http.auth.lib.php
7c7
<  * @version $Id: http.auth.lib.php 11184 2008-04-03 12:42:33Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/auth/signon.auth.lib.php phpmyadmin2/libraries/auth/signon.auth.lib.php
6c6
<  * @version $Id: signon.auth.lib.php 10424 2007-06-07 17:14:21Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/blowfish.php phpmyadmin2/libraries/blowfish.php
15c15
<  * @version $Id: blowfish.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/bookmark.lib.php phpmyadmin2/libraries/bookmark.lib.php
6c6
<  * @version $Id: bookmark.lib.php 11163 2008-03-16 11:28:18Z lem9 $
---
>  * @version $Id$
89a90
>  * @param   boolean   whether to ignore bookmarks with no user
95c96
< function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id', $action_bookmark_all = FALSE)
---
> function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id', $action_bookmark_all = FALSE, $exact_user_match = FALSE)
103,107c104,116
<     $query          = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
<                     . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
<                     . ($action_bookmark_all? '' : ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
<                     . '      OR user = \'\')')
<                     . ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
---
>     $query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
>         . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'';
> 
>     if (!$action_bookmark_all) {
>         $query .= ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'';
>         if (!$exact_user_match) {
>             $query .= ' OR user = \'\'';
>         }
>         $query .= ')';
>     }
> 
>     $query .= ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
> 
diff -r phpmyadmin/libraries/charset_conversion.lib.php phpmyadmin2/libraries/charset_conversion.lib.php
6c6
<  * @version $Id: charset_conversion.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/check_user_privileges.lib.php phpmyadmin2/libraries/check_user_privileges.lib.php
8c8
<  * @version $Id: check_user_privileges.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/cleanup.lib.php phpmyadmin2/libraries/cleanup.lib.php
6c6
<  * @version $Id: cleanup.lib.php 10723 2007-10-05 09:46:30Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/common.inc.php phpmyadmin2/libraries/common.inc.php
25c25
<  * @version $Id: common.inc.php 11431 2008-07-25 12:25:33Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/common.lib.php phpmyadmin2/libraries/common.lib.php
6c6
<  * @version $Id: common.lib.php 11321 2008-06-13 16:26:21Z lem9 $
---
>  * @version $Id$
476c476
<             $formatted_sql = substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
---
>             $formatted_sql = htmlspecialchars(substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
624a625
>         require_once './libraries/js_escape.lib.php';
630c631
<         echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
---
>         echo '<meta http-equiv="Refresh" content="0;url=' .  htmlspecialchars($uri) . '">' . "\n";
633c634
<         echo 'setTimeout("window.location = unescape(\'"' . $uri . '"\')", 2000);' . "\n";
---
>         echo 'setTimeout("window.location = unescape(\'"' . PMA_escapeJsString($uri) . '"\')", 2000);' . "\n";
640c641
<         echo 'document.write(\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
---
>         echo 'document.write(\'<p><a href="' . htmlspecialchars($uri) . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
1646c1647
<             $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')';
---
>             $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')';
diff -r phpmyadmin/libraries/config.default.php phpmyadmin2/libraries/config.default.php
19c19
<  * @version $Id: config.default.php 11422 2008-07-24 17:12:32Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/core.lib.php phpmyadmin2/libraries/core.lib.php
6c6
<  * @version $Id: core.lib.php 10420 2007-06-03 23:30:40Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/database_interface.lib.php phpmyadmin2/libraries/database_interface.lib.php
6c6
<  * @version $Id: database_interface.lib.php 11585 2008-09-15 12:03:45Z lem9 $
---
>  * @version $Id$
210a211,214
>     /* No sorting when key is not present */
>     if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
>         return 0;
>     }
diff -r phpmyadmin/libraries/db_common.inc.php phpmyadmin2/libraries/db_common.inc.php
5c5
<  * @version $Id: db_common.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/db_info.inc.php phpmyadmin2/libraries/db_info.inc.php
35c35
<  * @version $Id: db_info.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/db_links.inc.php phpmyadmin2/libraries/db_links.inc.php
5c5
<  * @version $Id: db_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/db_routines.inc.php phpmyadmin2/libraries/db_routines.inc.php
5c5
<  * @version $Id: db_routines.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/db_table_exists.lib.php phpmyadmin2/libraries/db_table_exists.lib.php
7c7
<  * @version $Id: db_table_exists.lib.php 12100 2008-12-09 13:45:32Z nijel $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/dbg/setup.php phpmyadmin2/libraries/dbg/setup.php
4c4
<  * @version $Id: setup.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/dbi/mysql.dbi.lib.php phpmyadmin2/libraries/dbi/mysql.dbi.lib.php
6c6
<  * @version $Id: mysql.dbi.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
302a303,304
>     $error_message = htmlspecialchars($error_message);
> 
diff -r phpmyadmin/libraries/dbi/mysqli.dbi.lib.php phpmyadmin2/libraries/dbi/mysqli.dbi.lib.php
6c6
<  * @version $Id: mysqli.dbi.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
419a420,421
>     $error_message = htmlspecialchars($error_message);
> 
diff -r phpmyadmin/libraries/display_change_password.lib.php phpmyadmin2/libraries/display_change_password.lib.php
6c6
<  * @version $Id: display_change_password.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_create_database.lib.php phpmyadmin2/libraries/display_create_database.lib.php
6c6
<  * @version $Id: display_create_database.lib.php 11402 2008-07-15 18:42:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_create_table.lib.php phpmyadmin2/libraries/display_create_table.lib.php
6c6
<  * @version $Id: display_create_table.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_export.lib.php phpmyadmin2/libraries/display_export.lib.php
5c5
<  * @version $Id: display_export.lib.php 12302 2009-03-24 08:55:07Z nijel $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_import.lib.php phpmyadmin2/libraries/display_import.lib.php
5c5
<  * @version $Id: display_import.lib.php 11405 2008-07-17 14:02:26Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_select_lang.lib.php phpmyadmin2/libraries/display_select_lang.lib.php
6c6
<  * @version $Id: display_select_lang.lib.php 11449 2008-08-01 19:00:36Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_tbl.lib.php phpmyadmin2/libraries/display_tbl.lib.php
5c5
<  * @version $Id: display_tbl.lib.php 11307 2008-06-10 16:32:39Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/display_tbl_links.lib.php phpmyadmin2/libraries/display_tbl_links.lib.php
10c10
<  * @version $Id: display_tbl_links.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/bdb.lib.php phpmyadmin2/libraries/engines/bdb.lib.php
4c4
<  * @version $Id: bdb.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/berkeleydb.lib.php phpmyadmin2/libraries/engines/berkeleydb.lib.php
4c4
<  * @version $Id: berkeleydb.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/binlog.lib.php phpmyadmin2/libraries/engines/binlog.lib.php
4c4
<  * @version $Id: binlog.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/innobase.lib.php phpmyadmin2/libraries/engines/innobase.lib.php
5c5
<  * @version $Id: innobase.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/innodb.lib.php phpmyadmin2/libraries/engines/innodb.lib.php
4c4
<  * @version $Id: innodb.lib.php 10478 2007-07-09 19:41:38Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/memory.lib.php phpmyadmin2/libraries/engines/memory.lib.php
4c4
<  * @version $Id: memory.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/merge.lib.php phpmyadmin2/libraries/engines/merge.lib.php
4c4
<  * @version $Id: merge.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/mrg_myisam.lib.php phpmyadmin2/libraries/engines/mrg_myisam.lib.php
4c4
<  * @version $Id: mrg_myisam.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/myisam.lib.php phpmyadmin2/libraries/engines/myisam.lib.php
4c4
<  * @version $Id: myisam.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/engines/ndbcluster.lib.php phpmyadmin2/libraries/engines/ndbcluster.lib.php
4c4
<  * @version $Id: ndbcluster.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/csv.php phpmyadmin2/libraries/export/csv.php
4c4
<  * @version $Id: csv.php 11357 2008-06-28 14:17:11Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/excel.php phpmyadmin2/libraries/export/excel.php
6c6
<  * @version $Id: excel.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/htmlexcel.php phpmyadmin2/libraries/export/htmlexcel.php
6c6
<  * @version $Id: htmlexcel.php 11484 2008-08-13 16:28:43Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/htmlword.php phpmyadmin2/libraries/export/htmlword.php
6c6
<  * @version $Id: htmlword.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/latex.php phpmyadmin2/libraries/export/latex.php
6c6
<  * @version $Id: latex.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/ods.php phpmyadmin2/libraries/export/ods.php
6c6
<  * @version $Id: ods.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/odt.php phpmyadmin2/libraries/export/odt.php
6c6
<  * @version $Id: odt.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/pdf.php phpmyadmin2/libraries/export/pdf.php
6c6
<  * @version $Id: pdf.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/sql.php phpmyadmin2/libraries/export/sql.php
6c6
<  * @version $Id: sql.php 11471 2008-08-09 13:58:44Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/xls.php phpmyadmin2/libraries/export/xls.php
6c6
<  * @version $Id: xls.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/xml.php phpmyadmin2/libraries/export/xml.php
6c6
<  * @version $Id: xml.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/export/yaml.php phpmyadmin2/libraries/export/yaml.php
6c6
<  * @version $Id: yaml.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/file_listing.php phpmyadmin2/libraries/file_listing.php
6c6
<  * @version $Id: file_listing.php 11001 2007-12-15 14:30:37Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/footer.inc.php phpmyadmin2/libraries/footer.inc.php
45c45
<  * @version $Id: footer.inc.php 11402 2008-07-15 18:42:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/get_foreign.lib.php phpmyadmin2/libraries/get_foreign.lib.php
5c5
<  * @version $Id: get_foreign.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/grab_globals.lib.php phpmyadmin2/libraries/grab_globals.lib.php
9c9
<  * @version $Id: grab_globals.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/header.inc.php phpmyadmin2/libraries/header.inc.php
5c5
<  * @version $Id: header.inc.php 11422 2008-07-24 17:12:32Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/header_http.inc.php phpmyadmin2/libraries/header_http.inc.php
5c5
<  * @version $Id: header_http.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/header_meta_style.inc.php phpmyadmin2/libraries/header_meta_style.inc.php
5c5
<  * @version $Id: header_meta_style.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/header_printview.inc.php phpmyadmin2/libraries/header_printview.inc.php
5c5
<  * @version $Id: header_printview.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/iconv_wrapper.lib.php phpmyadmin2/libraries/iconv_wrapper.lib.php
5c5
<  * @version $Id: iconv_wrapper.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/import/README phpmyadmin2/libraries/import/README
7c7
< /* $Id: README 9609 2006-10-26 10:52:15Z nijel $ */
---
> /* $Id$ */
diff -r phpmyadmin/libraries/import/csv.php phpmyadmin2/libraries/import/csv.php
7c7
<  * @version $Id: csv.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/import/docsql.php phpmyadmin2/libraries/import/docsql.php
6c6
<  * @version $Id: docsql.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/import/ldi.php phpmyadmin2/libraries/import/ldi.php
6c6
<  * @version $Id: ldi.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/import/sql.php phpmyadmin2/libraries/import/sql.php
6c6
<  * @version $Id: sql.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/import.lib.php phpmyadmin2/libraries/import.lib.php
6c6
<  * @version $Id: import.lib.php 11451 2008-08-01 20:02:21Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/information_schema_relations.lib.php phpmyadmin2/libraries/information_schema_relations.lib.php
5c5
<  * @version $Id: information_schema_relations.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/ip_allow_deny.lib.php phpmyadmin2/libraries/ip_allow_deny.lib.php
7c7
<  * @version $Id: ip_allow_deny.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/js_escape.lib.php phpmyadmin2/libraries/js_escape.lib.php
9c9
<  * @version $Id: js_escape.lib.php 11604 2008-09-22 14:09:44Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/kanji-encoding.lib.php phpmyadmin2/libraries/kanji-encoding.lib.php
12c12
<  * @version $Id: kanji-encoding.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
35c35
<         $enc_list = 'UTF-8,ASCII,SJIS,EUC-JP,JIS';
---
>         $enc_list = 'UTF-8ASCII,SJIS,EUC-JP,JIS';
diff -r phpmyadmin/libraries/language.lib.php phpmyadmin2/libraries/language.lib.php
6c6
<  * @version $Id: language.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/mcrypt.lib.php phpmyadmin2/libraries/mcrypt.lib.php
5c5
<  * @version $Id: mcrypt.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/mult_submits.inc.php phpmyadmin2/libraries/mult_submits.inc.php
5c5
<  * @version $Id: mult_submits.inc.php 11344 2008-06-24 17:33:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/mysql_charsets.lib.php phpmyadmin2/libraries/mysql_charsets.lib.php
5c5
<  * @version $Id: mysql_charsets.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/navigation_header.inc.php phpmyadmin2/libraries/navigation_header.inc.php
6c6
<  * @version $Id: navigation_header.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/ob.lib.php phpmyadmin2/libraries/ob.lib.php
12c12
<  * @version $Id: ob.lib.php 10892 2007-11-01 20:48:43Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/opendocument.lib.php phpmyadmin2/libraries/opendocument.lib.php
6c6
<  * @version $Id: opendocument.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/parse_analyze.lib.php phpmyadmin2/libraries/parse_analyze.lib.php
5c5
<  * @version $Id: parse_analyze.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/plugin_interface.lib.php phpmyadmin2/libraries/plugin_interface.lib.php
6c6
<  * @version $Id: plugin_interface.lib.php 11421 2008-07-23 16:55:33Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/relation.lib.php phpmyadmin2/libraries/relation.lib.php
6c6
<  * @version $Id: relation.lib.php 11376 2008-07-09 14:17:19Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/relation_cleanup.lib.php phpmyadmin2/libraries/relation_cleanup.lib.php
6c6
<  * @version $Id: relation_cleanup.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/sanitizing.lib.php phpmyadmin2/libraries/sanitizing.lib.php
5c5
<  * @version $Id: sanitizing.lib.php 10298 2007-04-17 17:08:12Z lem9 $
---
>  * @version $Id$
10c10,18
<  * for formatting
---
>  * for formatting.
>  *
>  * If you want to include result in element attribute, you should escape it.
>  *
>  * Examples:
>  *
>  * <p><?php echo PMA_sanitize($foo); ?></p>
>  *
>  * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
14a23
>  * @param   boolean  whether to escape html in result
20c29
< function PMA_sanitize($message)
---
> function PMA_sanitize($message, $escape = false)
67a77,80
>     if ($escape) {
>         $message = htmlspecialchars($message);
>     }
> 
diff -r phpmyadmin/libraries/select_lang.lib.php phpmyadmin2/libraries/select_lang.lib.php
6c6
<  * @version $Id: select_lang.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/select_server.lib.php phpmyadmin2/libraries/select_server.lib.php
6c6
<  * @version $Id: select_server.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/server_common.inc.php phpmyadmin2/libraries/server_common.inc.php
10c10
<  * @version $Id: server_common.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/server_links.inc.php phpmyadmin2/libraries/server_links.inc.php
5c5
<  * @version $Id: server_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/session.inc.php phpmyadmin2/libraries/session.inc.php
6c6
<  * @version $Id: session.inc.php 11450 2008-08-01 19:15:01Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/sql_query_form.lib.php phpmyadmin2/libraries/sql_query_form.lib.php
6c6
<  * @version $Id: sql_query_form.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/sqlparser.data.php phpmyadmin2/libraries/sqlparser.data.php
22c22
<  * @version$Id: sqlparser.data.php 11345 2008-06-24 17:51:49Z lem9 $
---
>  * @version$Id$
diff -r phpmyadmin/libraries/sqlparser.lib.php phpmyadmin2/libraries/sqlparser.lib.php
30c30
<  * @version $Id: sqlparser.lib.php 11513 2008-08-28 16:17:53Z lem9 $
---
>  * @version $Id$
155c155
<         $debugstr .= 'SVN: $Id: sqlparser.lib.php 11513 2008-08-28 16:17:53Z lem9 $' . "\n";
---
>         $debugstr .= 'SVN: $Id$' . "\n";
2428c2428,2436
<             $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : $arr[$i]['data']). $after;
---
>             $str .= $before;
>             if ($mode=='color') {
>                 $str .= PMA_SQP_formatHTML_colorize($arr[$i]);
>             } elseif ($mode == 'text') {
>                 $str .= htmlspecialchars($arr[$i]['data']);
>             } else {
>                 $str .= $arr[$i]['data'];
>             }
>             $str .= $after;
diff -r phpmyadmin/libraries/sqlvalidator.class.php phpmyadmin2/libraries/sqlvalidator.class.php
28c28
< * @version  $Id: sqlvalidator.class.php 11335 2008-06-21 14:01:54Z lem9 $
---
> * @version  $Id$
182c182
<             $this->calling_program_version       = '$Revision: 11335 $';
---
>             $this->calling_program_version       = '$Revision$';
diff -r phpmyadmin/libraries/sqlvalidator.lib.php phpmyadmin2/libraries/sqlvalidator.lib.php
30c30
<  * @version $Id: sqlvalidator.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/string.lib.php phpmyadmin2/libraries/string.lib.php
15c15
<  * @version $Id: string.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/string_mb.lib.php phpmyadmin2/libraries/string_mb.lib.php
15c15
<  * @version $Id: string_mb.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/string_native.lib.php phpmyadmin2/libraries/string_native.lib.php
15c15
<  * @version $Id: string_native.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/string_type_ctype.lib.php phpmyadmin2/libraries/string_type_ctype.lib.php
15c15
<  * @version $Id: string_type_ctype.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/string_type_native.lib.php phpmyadmin2/libraries/string_type_native.lib.php
15c15
<  * @version $Id: string_type_native.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_common.php phpmyadmin2/libraries/tbl_common.php
5c5
<  * @version $Id: tbl_common.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_indexes.lib.php phpmyadmin2/libraries/tbl_indexes.lib.php
6c6
<  * @version $Id: tbl_indexes.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_info.inc.php phpmyadmin2/libraries/tbl_info.inc.php
5c5
<  * @version $Id: tbl_info.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_links.inc.php phpmyadmin2/libraries/tbl_links.inc.php
5c5
<  * @version $Id: tbl_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_properties.inc.php phpmyadmin2/libraries/tbl_properties.inc.php
5c5
<  * @version $Id: tbl_properties.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_replace_fields.inc.php phpmyadmin2/libraries/tbl_replace_fields.inc.php
20c20
<  * @version $Id: tbl_replace_fields.inc.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tbl_triggers.lib.php phpmyadmin2/libraries/tbl_triggers.lib.php
5c5
<  * @version $Id: tbl_triggers.lib.php 11335 2008-06-21 14:01:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/tcpdf/font/LICENSE phpmyadmin2/libraries/tcpdf/font/LICENSE
98c98
< $Id: LICENSE 10140 2007-03-20 08:32:55Z cybot_tm $
---
> $Id$
diff -r phpmyadmin/libraries/transformations/TEMPLATE phpmyadmin2/libraries/transformations/TEMPLATE
2c2
< /* $Id: TEMPLATE 5208 2003-11-26 22:52:25Z rabus $ */
---
> /* $Id$ */
diff -r phpmyadmin/libraries/transformations/TEMPLATE_MIMETYPE phpmyadmin2/libraries/transformations/TEMPLATE_MIMETYPE
2c2
< /* $Id: TEMPLATE_MIMETYPE 5208 2003-11-26 22:52:25Z rabus $ */
---
> /* $Id$ */
diff -r phpmyadmin/libraries/transformations/application_octetstream__download.inc.php phpmyadmin2/libraries/transformations/application_octetstream__download.inc.php
5c5
<  * @version $Id: application_octetstream__download.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/application_octetstream__hex.inc.php phpmyadmin2/libraries/transformations/application_octetstream__hex.inc.php
5c5
<  * @version $Id: application_octetstream__hex.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/generator.sh phpmyadmin2/libraries/transformations/generator.sh
2c2
< # $Id: generator.sh 9537 2006-10-12 16:27:13Z nijel $
---
> # $Id$
diff -r phpmyadmin/libraries/transformations/global.inc.php phpmyadmin2/libraries/transformations/global.inc.php
22c22
<  * @version $Id: global.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php phpmyadmin2/libraries/transformations/image_jpeg__inline.inc.php
5c5
<  * @version $Id: image_jpeg__inline.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/image_jpeg__link.inc.php phpmyadmin2/libraries/transformations/image_jpeg__link.inc.php
5c5
<  * @version $Id: image_jpeg__link.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/image_png__inline.inc.php phpmyadmin2/libraries/transformations/image_png__inline.inc.php
5c5
<  * @version $Id: image_png__inline.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/template_generator.sh phpmyadmin2/libraries/transformations/template_generator.sh
2c2
< # $Id: template_generator.sh 9537 2006-10-12 16:27:13Z nijel $
---
> # $Id$
diff -r phpmyadmin/libraries/transformations/template_generator_mimetype.sh phpmyadmin2/libraries/transformations/template_generator_mimetype.sh
2c2
< # $Id: template_generator_mimetype.sh 9537 2006-10-12 16:27:13Z nijel $
---
> # $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__dateformat.inc.php phpmyadmin2/libraries/transformations/text_plain__dateformat.inc.php
5c5
<  * @version $Id: text_plain__dateformat.inc.php 11084 2008-01-27 14:07:50Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__external.inc.php phpmyadmin2/libraries/transformations/text_plain__external.inc.php
5c5
<  * @version $Id: text_plain__external.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__formatted.inc.php phpmyadmin2/libraries/transformations/text_plain__formatted.inc.php
5c5
<  * @version $Id: text_plain__formatted.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__imagelink.inc.php phpmyadmin2/libraries/transformations/text_plain__imagelink.inc.php
5c5
<  * @version $Id: text_plain__imagelink.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__link.inc.php phpmyadmin2/libraries/transformations/text_plain__link.inc.php
5c5
<  * @version $Id: text_plain__link.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__sql.inc.php phpmyadmin2/libraries/transformations/text_plain__sql.inc.php
5c5
<  * @version $Id: text_plain__sql.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations/text_plain__substr.inc.php phpmyadmin2/libraries/transformations/text_plain__substr.inc.php
5c5
<  * @version $Id: text_plain__substr.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/transformations.lib.php phpmyadmin2/libraries/transformations.lib.php
6c6
<  * @version $Id: transformations.lib.php 10211 2007-03-27 13:07:49Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/unzip.lib.php phpmyadmin2/libraries/unzip.lib.php
3c3
< /* $Id: unzip.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $ */
---
> /* $Id$ */
diff -r phpmyadmin/libraries/url_generating.lib.php phpmyadmin2/libraries/url_generating.lib.php
6c6
<  * @version $Id: url_generating.lib.php 10229 2007-03-30 09:12:05Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/libraries/zip.lib.php phpmyadmin2/libraries/zip.lib.php
5c5
<  * @version $Id: zip.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/license.php phpmyadmin2/license.php
9c9
<  * @version $Id: license.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
16c16,25
< readfile('LICENSE');
---
> 
> $filename = 'LICENSE';
> 
> // Check if the file is available, some distributions remove these.
> if (is_readable($filename)) {
>     readfile($filename);
> } else {
>     echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
> }
> 
diff -r phpmyadmin/main.php phpmyadmin2/main.php
5c5
<  * @version $Id: main.php 12304 2009-03-24 12:56:58Z nijel $
---
>  * @version $Id$
394c394,395
< /*if ($server > 0 && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)) {
---
> /*
> if ($server > 0 && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)) {
diff -r phpmyadmin/navigation.php phpmyadmin2/navigation.php
6c6
<  * @version $Id: navigation.php 11320 2008-06-12 20:00:23Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pdf_pages.php phpmyadmin2/pdf_pages.php
5c5
<  * @version $Id: pdf_pages.php 13034 2009-10-12 21:47:40Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pdf_schema.php phpmyadmin2/pdf_schema.php
6c6
<  * @version $Id: pdf_schema.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/phpinfo.php phpmyadmin2/phpinfo.php
5c5
<  * @version $Id: phpinfo.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/phpmyadmin.css.php phpmyadmin2/phpmyadmin.css.php
5c5
<  * @version $Id: phpmyadmin.css.php 11450 2008-08-01 19:15:01Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd/scripts/ajax.js phpmyadmin2/pmd/scripts/ajax.js
4c4
<  * @version $Id: ajax.js 10385 2007-05-14 07:49:56Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd/scripts/iecanvas.js phpmyadmin2/pmd/scripts/iecanvas.js
4c4
<  * @version $Id: iecanvas.js 10149 2007-03-20 15:11:15Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd/scripts/move.js phpmyadmin2/pmd/scripts/move.js
3c3
<  * @version $Id: move.js 10416 2007-05-30 16:55:18Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd/styles/default/style1.css phpmyadmin2/pmd/styles/default/style1.css
3c3
<  * @version $Id: style1.css 10219 2007-03-28 16:36:12Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_common.php phpmyadmin2/pmd_common.php
5c5
<  * @version $Id: pmd_common.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_display_field.php phpmyadmin2/pmd_display_field.php
5c5
<  * @version $Id: pmd_display_field.php 10149 2007-03-20 15:11:15Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_general.php phpmyadmin2/pmd_general.php
5c5
<  * @version $Id: pmd_general.php 10413 2007-05-26 18:31:40Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_help.php phpmyadmin2/pmd_help.php
5c5
<  * @version $Id: pmd_help.php 10149 2007-03-20 15:11:15Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_pdf.php phpmyadmin2/pmd_pdf.php
5c5
<  * @version $Id: pmd_pdf.php 13034 2009-10-12 21:47:40Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_relation_new.php phpmyadmin2/pmd_relation_new.php
5c5
<  * @version $Id: pmd_relation_new.php 11132 2008-02-21 17:42:07Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_relation_upd.php phpmyadmin2/pmd_relation_upd.php
5c5
<  * @version $Id: pmd_relation_upd.php 11132 2008-02-21 17:42:07Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/pmd_save_pos.php phpmyadmin2/pmd_save_pos.php
5c5
<  * @version $Id: pmd_save_pos.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/querywindow.php phpmyadmin2/querywindow.php
41c41
<  * @version $Id: querywindow.php 11376 2008-07-09 14:17:19Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/readme.php phpmyadmin2/readme.php
9c9
<  * @version $Id: readme.php 10142 2007-03-20 10:32:13Z cybot_tm $
---
>  * @version $Id$
16c16,24
< readfile('README');
---
> 
> $filename = 'README';
> 
> // Check if the file is available, some distributions remove these.
> if (is_readable($filename)) {
>     readfile($filename);
> } else {
>     echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information.";
> }
diff -r phpmyadmin/scripts/check_lang.php phpmyadmin2/scripts/check_lang.php
7c7
<  * @version $Id: check_lang.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/scripts/convertcfg.pl phpmyadmin2/scripts/convertcfg.pl
3c3
< # $Id: convertcfg.pl 5152 2003-11-18 15:20:45Z nijel $
---
> # $Id$
phpmyadmin/scripts¤À¤±¤Ëȯ¸«: create-release.sh
diff -r phpmyadmin/scripts/create_tables.sql phpmyadmin2/scripts/create_tables.sql
15c15
< -- $Id: create_tables.sql 10257 2007-04-07 14:40:24Z lem9 $
---
> -- $Id$
diff -r phpmyadmin/scripts/create_tables_mysql_4_1_2+.sql phpmyadmin2/scripts/create_tables_mysql_4_1_2+.sql
19c19
< -- $Id: create_tables_mysql_4_1_2+.sql 9676 2006-11-07 14:16:18Z lem9 $
---
> -- $Id$
diff -r phpmyadmin/scripts/decode_bug.php phpmyadmin2/scripts/decode_bug.php
11c11
<  * @version $Id: decode_bug.php 10289 2007-04-16 13:32:45Z cybot_tm $
---
>  * @version $Id$
phpmyadmin/scripts¤À¤±¤Ëȯ¸«: lang-cleanup.sh
phpmyadmin/scripts¤À¤±¤Ëȯ¸«: remove_control_m.sh
diff -r phpmyadmin/scripts/setup.php phpmyadmin2/scripts/setup.php
13c13
<  * @version    $Id: setup.php 13149 2009-12-07 13:09:09Z nijel $
---
>  * @version    $Id$
29c29
< $script_version = '$Id: setup.php 13149 2009-12-07 13:09:09Z nijel $';
---
> $script_version = '$Id$';
520a521
>                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
diff -r phpmyadmin/scripts/signon.php phpmyadmin2/scripts/signon.php
10c10
<  * @version $Id: signon.php 11204 2008-04-21 17:06:03Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/scripts/upgrade.pl phpmyadmin2/scripts/upgrade.pl
3c3
< # $Id: upgrade.pl 9743 2006-11-19 13:10:31Z lem9 $
---
> # $Id$
diff -r phpmyadmin/scripts/upgrade_tables_mysql_4_1_2+.sql phpmyadmin2/scripts/upgrade_tables_mysql_4_1_2+.sql
13c13
< -- $Id: upgrade_tables_mysql_4_1_2+.sql 10212 2007-03-27 13:53:14Z cybot_tm $
---
> -- $Id$
diff -r phpmyadmin/server_binlog.php phpmyadmin2/server_binlog.php
39c39
<  * @version $Id: server_binlog.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_collations.php phpmyadmin2/server_collations.php
5c5
<  * @version $Id: server_collations.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_databases.php phpmyadmin2/server_databases.php
5c5
<  * @version $Id: server_databases.php 10462 2007-06-25 14:00:35Z lem9 $
---
>  * @version $Id$
290c290
<         $common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . $dbstats;
---
>         $common_url_query = PMA_generate_common_url(array('sort_by' => $sort_by, 'sort_order' => $sort_order, 'dbstats' => $dbstats));
292c292
<            . '<a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
---
>            . '<a href="./server_databases.php' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
294c294
<            . '<a href="./server_databases.php?' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
---
>            . '<a href="./server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
diff -r phpmyadmin/server_engines.php phpmyadmin2/server_engines.php
6c6
<  * @version $Id: server_engines.php 10358 2007-05-09 10:55:52Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_export.php phpmyadmin2/server_export.php
5c5
<  * @version $Id: server_export.php 10517 2007-07-22 17:07:18Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/server_import.php phpmyadmin2/server_import.php
5c5
<  * @version $Id: server_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_privileges.php phpmyadmin2/server_privileges.php
5c5
<  * @version $Id: server_privileges.php 10908 2007-11-09 07:41:47Z cybot_tm $
---
>  * @version $Id$
605c605
<        . $spaces . '<input type="text" name="username" maxlength="' . $username_length . '" title="' . $GLOBALS['strUserName'] . '"' . (empty($GLOBALS['username']) ? '' : ' value="' . (isset($GLOBALS['new_username']) ? $GLOBALS['new_username'] : $GLOBALS['username']) . '"') . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
---
>        . $spaces . '<input type="text" name="username" maxlength="' . $username_length . '" title="' . $GLOBALS['strUserName'] . '"' . (empty($GLOBALS['username']) ? '' : ' value="' . htmlspecialchars(isset($GLOBALS['new_username']) ? $GLOBALS['new_username'] : $GLOBALS['username']) . '"') . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
653c653
<        . $spaces . '<input type="text" name="hostname" maxlength="' . $hostname_length . '" value="' . (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '') . '" title="' . $GLOBALS['strHost'] . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
---
>        . $spaces . '<input type="text" name="hostname" maxlength="' . $hostname_length . '" value="' . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '') . '" title="' . $GLOBALS['strHost'] . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
760c760
<         $message = sprintf($GLOBALS['strUserAlreadyExists'], '[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
---
>         $message = sprintf($GLOBALS['strUserAlreadyExists'], '[i]\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'[/i]');
767c767
<             $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\'';
---
>             $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . htmlspecialchars($hostname) . '\'';
1051c1051
<     $message = sprintf($GLOBALS['strUpdatePrivMessage'], '\'' . $username . '\'@\'' . $hostname . '\'');
---
>     $message = sprintf($GLOBALS['strUpdatePrivMessage'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
1083c1083
<     $message = sprintf($GLOBALS['strRevokeMessage'], '\'' . $username . '\'@\'' . $hostname . '\'');
---
>     $message = sprintf($GLOBALS['strRevokeMessage'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
1118c1118
<         $message = sprintf($GLOBALS['strPasswordChanged'], '\'' . $username . '\'@\'' . $hostname . '\'');
---
>         $message = sprintf($GLOBALS['strPasswordChanged'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
1591c1591
<            . $GLOBALS['strUser'] . ' <i><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
---
>            . $GLOBALS['strUser'] . ' <i><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;username=' . htmlspecialchars(urlencode($username)) . '&amp;hostname=' . htmlspecialchars(urlencode($hostname)) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
1598c1598
<             $url_dbname = urlencode(str_replace('\_', '_', $dbname));
---
>             $url_dbname = htmlspecialchars(urlencode(str_replace('\_', '_', $dbname)));
1601c1601
<                 echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;table=' . urlencode($tablename) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
---
>                 echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename)) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
1842,1844c1842,1844
<                     printf($link_edit, urlencode($username),
<                         urlencode($hostname),
<                         urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname),
---
>                     printf($link_edit, htmlspecialchars(urlencode($username)),
>                         htmlspecialchars(urlencode($hostname)),
>                         htmlspecialchars(urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname)),
1849,1851c1849,1851
<                         printf($link_revoke, urlencode($username),
<                             urlencode($hostname),
<                             urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname),
---
>                         printf($link_revoke, htmlspecialchars(urlencode($username)),
>                             htmlspecialchars(urlencode($hostname)),
>                             htmlspecialchars(urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname)),
diff -r phpmyadmin/server_processlist.php phpmyadmin2/server_processlist.php
5c5
<  * @version $Id: server_processlist.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_sql.php phpmyadmin2/server_sql.php
5c5
<  * @version $Id: server_sql.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/server_status.php phpmyadmin2/server_status.php
7c7
<  * @version $Id: server_status.php 10871 2007-10-22 12:15:53Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/server_variables.php phpmyadmin2/server_variables.php
5c5
<  * @version $Id: server_variables.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/show_config_errors.php phpmyadmin2/show_config_errors.php
6c6
<  * @version $Id: show_config_errors.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/sql.php phpmyadmin2/sql.php
6c6
<  * @version $Id: sql.php 11163 2008-03-16 11:28:18Z lem9 $
---
>  * @version $Id$
57c57
<         'label');
---
>         'label', FALSE, TRUE);
178c178
<     <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows) : ''; ?>" />
---
>     <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows, true) : ''; ?>" />
180,185c180,185
<     <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back) : ''; ?>" />
<     <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload) : 0; ?>" />
<     <input type="hidden" name="purge" value="<?php echo isset($purge) ? PMA_sanitize($purge) : ''; ?>" />
<     <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? PMA_sanitize($cpurge) : ''; ?>" />
<     <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? PMA_sanitize($purgekey) : ''; ?>" />
<     <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? PMA_sanitize($show_query) : ''; ?>" />
---
>     <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back, true) : ''; ?>" />
>     <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload, true) : 0; ?>" />
>     <input type="hidden" name="purge" value="<?php echo isset($purge) ? PMA_sanitize($purge, true) : ''; ?>" />
>     <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? PMA_sanitize($cpurge, true) : ''; ?>" />
>     <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? PMA_sanitize($purgekey, true) : ''; ?>" />
>     <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? PMA_sanitize($show_query, true) : ''; ?>" />
diff -r phpmyadmin/tbl_addfield.php phpmyadmin2/tbl_addfield.php
5c5
<  * @version $Id: tbl_addfield.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_alter.php phpmyadmin2/tbl_alter.php
5c5
<  * @version $Id: tbl_alter.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_change.php phpmyadmin2/tbl_change.php
5c5
<  * @version $Id: tbl_change.php 11337 2008-06-23 11:56:41Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_create.php phpmyadmin2/tbl_create.php
37c37
<  * @version $Id: tbl_create.php 10633 2007-09-13 00:06:29Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_export.php phpmyadmin2/tbl_export.php
5c5
<  * @version $Id: tbl_export.php 11061 2008-01-18 18:29:17Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_import.php phpmyadmin2/tbl_import.php
5c5
<  * @version $Id: tbl_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_indexes.php phpmyadmin2/tbl_indexes.php
6c6
<  * @version $Id: tbl_indexes.php 11058 2008-01-17 17:50:31Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_move_copy.php phpmyadmin2/tbl_move_copy.php
5c5
<  * @version $Id: tbl_move_copy.php 11027 2007-12-30 20:59:57Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_operations.php phpmyadmin2/tbl_operations.php
5c5
<  * @version $Id: tbl_operations.php 11027 2007-12-30 20:59:57Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_printview.php phpmyadmin2/tbl_printview.php
5c5
<  * @version $Id: tbl_printview.php 11228 2008-05-03 11:59:52Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_relation.php phpmyadmin2/tbl_relation.php
5c5
<  * @version $Id: tbl_relation.php 11366 2008-07-04 14:36:18Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_replace.php phpmyadmin2/tbl_replace.php
8c8
<  * @version $Id: tbl_replace.php 11281 2008-05-18 15:53:27Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_row_action.php phpmyadmin2/tbl_row_action.php
5c5
<  * @version $Id: tbl_row_action.php 10398 2007-05-15 11:16:10Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_select.php phpmyadmin2/tbl_select.php
5c5
<  * @version $Id: tbl_select.php 10241 2007-04-01 11:13:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/tbl_sql.php phpmyadmin2/tbl_sql.php
5c5
<  * @version $Id: tbl_sql.php 10965 2007-12-05 17:53:52Z lem9 $
---
>  * @version $Id$
40c40
< PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';');
---
> PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';');
diff -r phpmyadmin/tbl_structure.php phpmyadmin2/tbl_structure.php
5c5
<  * @version $Id: tbl_structure.php 11354 2008-06-27 15:08:21Z lem9 $
---
>  * @version $Id$
phpmyadmin¤À¤±¤Ëȯ¸«: test
diff -r phpmyadmin/themes/darkblue_orange/css/theme_right.css.php phpmyadmin2/themes/darkblue_orange/css/theme_right.css.php
6c6
<  * @version $Id: theme_right.css.php 10666 2007-09-26 13:49:55Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/themes/darkblue_orange/info.inc.php phpmyadmin2/themes/darkblue_orange/info.inc.php
6c6
<  * @version $Id: info.inc.php 10147 2007-03-20 14:54:22Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/themes/darkblue_orange/layout.inc.php phpmyadmin2/themes/darkblue_orange/layout.inc.php
7c7
<  * @version $Id: layout.inc.php 11036 2008-01-05 14:30:41Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/themes/original/css/theme_left.css.php phpmyadmin2/themes/original/css/theme_left.css.php
6c6
<  * @version $Id: theme_left.css.php 11409 2008-07-19 14:46:28Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/themes/original/css/theme_print.css.php phpmyadmin2/themes/original/css/theme_print.css.php
6c6
<  * @version $Id: theme_print.css.php 10145 2007-03-20 13:39:12Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/themes/original/css/theme_right.css.php phpmyadmin2/themes/original/css/theme_right.css.php
6c6
<  * @version $Id: theme_right.css.php 11126 2008-02-15 21:17:17Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/themes/original/info.inc.php phpmyadmin2/themes/original/info.inc.php
6c6
<  * @version $Id: info.inc.php 10145 2007-03-20 13:39:12Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/themes/original/layout.inc.php phpmyadmin2/themes/original/layout.inc.php
7c7
<  * @version $Id: layout.inc.php 10515 2007-07-22 16:22:54Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/themes.php phpmyadmin2/themes.php
5c5
<  * @version $Id: themes.php 10239 2007-04-01 09:51:41Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/transformation_overview.php phpmyadmin2/transformation_overview.php
5c5
<  * @version $Id: transformation_overview.php 10146 2007-03-20 14:16:18Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/transformation_wrapper.php phpmyadmin2/transformation_wrapper.php
5c5
<  * @version $Id: transformation_wrapper.php 10240 2007-04-01 11:02:46Z cybot_tm $
---
>  * @version $Id$
diff -r phpmyadmin/translators.html phpmyadmin2/translators.html
5c5
< <!-- $Id: translators.html 13152 2009-12-07 17:13:18Z lem9 $ -->
---
> <!-- $Id$ -->
11c11
<     <title>phpMyAdmin 2.11.10 - Official translators</title>
---
>     <title>phpMyAdmin 2.11.11.3 - Official translators</title>
34c34
< <h1>phpMyAdmin 2.11.10 official translators list</h1>
---
> <h1>phpMyAdmin 2.11.11.3 official translators list</h1>
diff -r phpmyadmin/user_password.php phpmyadmin2/user_password.php
5c5
<  * @version $Id: user_password.php 10501 2007-07-18 15:32:08Z lem9 $
---
>  * @version $Id$
diff -r phpmyadmin/view_create.php phpmyadmin2/view_create.php
5c5
<  * @version $Id: view_create.php 11343 2008-06-24 14:11:54Z lem9 $
---
>  * @version $Id$