- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_10_1-6-g510a5c0
by Marc Delisle 31 Aug '10

31 Aug '10

The branch, QA_2_11 has been updated via 510a5c0b69bfd19610a3116d530db02317e40db5 (commit) from 20c87804372c425664211babe22ac918629acdc1 (commit) - Log ----------------------------------------------------------------- commit 510a5c0b69bfd19610a3116d530db02317e40db5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 31 12:18:02 2010 -0400 2.11.12-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4307e13..90dcd37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +2.11.12.0 (not yet released) + 2.11.11.0 (not yet released) - [core] Fix broken cleanup of $_GET - bug #3054458 [core] Fixed displaying number of rows. diff --git a/Documentation.html b/Documentation.html index b03ed8b..fe3d5f5 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.11-dev - Documentation</title> + <title>phpMyAdmin 2.11.12-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -33,7 +33,7 @@ <li><a href="#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11-dev Documentation</h1> +<h1>phpMyAdmin 2.11.12-dev Documentation</h1> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> diff --git a/README b/README index 46099cc..fe806d5 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.11-dev + Version 2.11.12-dev ------------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4f62cd3..c2e4efb 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -85,7 +85,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.11.11-dev'); + $this->set('PMA_VERSION', '2.11.12-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 767405f..90f6b0f 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.11-dev - Official translators</title> + <title>phpMyAdmin 2.11.12-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -31,7 +31,7 @@ <li><a href="Documentation.html#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11-dev official translators list</h1> +<h1>phpMyAdmin 2.11.12-dev official translators list</h1> <p> Here is the list of the "official translators" of phpMyAdmin.</p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, created. RELEASE_2_11_10_1-6-g0e4369a
by Marc Delisle 31 Aug '10

31 Aug '10

The branch, MAINT_2_11_11 has been created at 0e4369a8d2e4dbd1f3e0493b75b4f85eb1f0f908 (commit) - Log ----------------------------------------------------------------- commit 0e4369a8d2e4dbd1f3e0493b75b4f85eb1f0f908 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 31 12:16:00 2010 -0400 2.11.11-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_6-16-g9b846d6
by Marc Delisle 31 Aug '10

31 Aug '10

The branch, QA_3_3 has been updated via 9b846d65a82e6c2bdcf953025842acc45619dcab (commit) from 1b812f2d25189b4903028d7f98793542559b1d14 (commit) - Log ----------------------------------------------------------------- commit 9b846d65a82e6c2bdcf953025842acc45619dcab Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 31 12:11:49 2010 -0400 3.3.8-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 076faab..f039bfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.8.0 (not yet released) + 3.3.7.0 (not yet released) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 diff --git a/Documentation.html b/Documentation.html index 95e940f..0fa444c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.7-dev - Documentation</title> + <title>phpMyAdmin 3.3.8-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.7-dev + 3.3.8-dev Documentation </h1> </div> diff --git a/README b/README index bdcdd66..2b4ba87 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.7-dev + Version 3.3.8-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6ac9aca..9ea3b44 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.7-dev'); + $this->set('PMA_VERSION', '3.3.8-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 707b400..6a788fb 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.7-dev - Official translators</title> + <title>phpMyAdmin 3.3.8-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.7-dev + 3.3.8-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_7, created. RELEASE_3_3_6-16-gc39c407
by Marc Delisle 31 Aug '10

31 Aug '10

The branch, MAINT_3_3_7 has been created at c39c407bb5c91fcd6d6f16049f921a3b3d7cd8a5 (commit) - Log ----------------------------------------------------------------- commit c39c407bb5c91fcd6d6f16049f921a3b3d7cd8a5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 31 12:09:07 2010 -0400 3.3.7-rc1 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9338-gd2de55c
by Michal Čihař 31 Aug '10

31 Aug '10

The branch, master has been updated via d2de55cb0b40c8c8d475f85f6318ec85e4b97701 (commit) via 1b812f2d25189b4903028d7f98793542559b1d14 (commit) from 29fc903dc9a3b191cfea55fc112c095a78827605 (commit) - Log ----------------------------------------------------------------- commit d2de55cb0b40c8c8d475f85f6318ec85e4b97701 Merge: 29fc903dc9a3b191cfea55fc112c095a78827605 1b812f2d25189b4903028d7f98793542559b1d14 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Aug 31 11:44:30 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6f7064a..2a05638 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1087,6 +1087,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Basic url query part $url_params = array(); + if (! isset($GLOBALS['db'])) { + $GLOBALS['db'] = ''; + } if (strlen($GLOBALS['db'])) { $url_params['db'] = $GLOBALS['db']; if (strlen($GLOBALS['table'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9336-g29fc903
by Michal Čihař 30 Aug '10

30 Aug '10

The branch, master has been updated via 29fc903dc9a3b191cfea55fc112c095a78827605 (commit) via 677b440b20893ecdd88da27ec10dd5cd3e5615e1 (commit) via f12bcf6eafebceae27dd1e678a965696c453d81c (commit) via 85e795e0d822e29d6fac96414f533d546a1c5cab (commit) from c5ab6175cd6bb99c7960ab2785bb8c756b14124b (commit) - Log ----------------------------------------------------------------- commit 29fc903dc9a3b191cfea55fc112c095a78827605 Merge: c5ab6175cd6bb99c7960ab2785bb8c756b14124b 677b440b20893ecdd88da27ec10dd5cd3e5615e1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 30 20:15:54 2010 +0200 Merge remote branch 'pootle/master' commit 677b440b20893ecdd88da27ec10dd5cd3e5615e1 Author: Vladimir Tošić <vtosic(a)gmail.com> Date: Mon Aug 30 19:31:17 2010 +0200 Translation update done using Pootle. commit f12bcf6eafebceae27dd1e678a965696c453d81c Author: Vladimir Tošić <vtosic(a)gmail.com> Date: Mon Aug 30 19:29:11 2010 +0200 Translation update done using Pootle. commit 85e795e0d822e29d6fac96414f533d546a1c5cab Author: Vladimir Tošić <vtosic(a)gmail.com> Date: Mon Aug 30 19:27:36 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sr(a)latin.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index eb51206..7337abd 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-30 17:37+0200\n" -"PO-Revision-Date: 2010-08-30 15:22+0200\n" +"PO-Revision-Date: 2010-08-30 19:31+0200\n" "Last-Translator: Vladimir Tošić <vtosic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" "Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -98,7 +98,7 @@ msgstr "Koristi ovu vrednost" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Nema konfigurisanih blob streaming servera!" #: bs_disp_as_mime_type.php:35 #, fuzzy @@ -108,7 +108,7 @@ msgstr "Neuspelo upisivanje datoteke na disk." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Neuspelo otvaranje udaljene URL adrese" #: db_create.php:55 #, fuzzy, php-format @@ -287,9 +287,8 @@ msgid "Database %s has been dropped." msgstr "Baza %s je odbačena." #: db_operations.php:414 -#, fuzzy msgid "Drop the database (DROP)" -msgstr "Baza ne postoji" +msgstr "Ukloni bazu i njen sadržaj" #: db_operations.php:442 msgid "Copy database to" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9332-gc5ab617
by Marc Delisle 30 Aug '10

30 Aug '10

The branch, master has been updated via c5ab6175cd6bb99c7960ab2785bb8c756b14124b (commit) from fe868a5bf286ffecf143e261b39203e58a6826c6 (commit) - Log ----------------------------------------------------------------- commit c5ab6175cd6bb99c7960ab2785bb8c756b14124b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 30 13:28:51 2010 -0400 table name should be displayed on top ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 69 +++++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 34 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 448f1c0..33531ea 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -127,51 +127,52 @@ if (!$GLOBALS['is_ajax_request']) { // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") // so do not display the table name in upper div - } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { - require_once './libraries/tbl_info.inc.php'; + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + require_once './libraries/tbl_info.inc.php'; - echo $separator; - printf($item, + echo $separator; + printf($item, $GLOBALS['cfg']['DefaultTabTable'], PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']), str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])), (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')), (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png'); - /** - * Displays table comment - * @uses $show_comment from libraries/tbl_info.inc.php - * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php - */ - if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { - if (strstr($show_comment, '; InnoDB free')) { - $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); - } - echo '<span class="table_comment" id="span_table_comment">' - .'"' . htmlspecialchars($show_comment) - .'"</span>' . "\n"; - } // end if - } else { - // no table selected, display database comment if present - /** - * Settings for relations stuff - */ - require_once './libraries/relation.lib.php'; - $cfgRelation = PMA_getRelationsParam(); - - // Get additional information about tables for tooltip is done - // in libraries/db_info.inc.php only once - if ($cfgRelation['commwork']) { - $comment = PMA_getDbComment($GLOBALS['db']); /** * Displays table comment + * @uses $show_comment from libraries/tbl_info.inc.php + * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ - if (! empty($comment)) { - echo '<span class="table_comment"' - . ' id="span_table_comment">"' - . htmlspecialchars($comment) - . '"</span>' . "\n"; + if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { + if (strstr($show_comment, '; InnoDB free')) { + $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); + } + echo '<span class="table_comment" id="span_table_comment">' + .'"' . htmlspecialchars($show_comment) + .'"</span>' . "\n"; } // end if + } else { + // no table selected, display database comment if present + /** + * Settings for relations stuff + */ + require_once './libraries/relation.lib.php'; + $cfgRelation = PMA_getRelationsParam(); + + // Get additional information about tables for tooltip is done + // in libraries/db_info.inc.php only once + if ($cfgRelation['commwork']) { + $comment = PMA_getDbComment($GLOBALS['db']); + /** + * Displays table comment + */ + if (! empty($comment)) { + echo '<span class="table_comment"' + . ' id="span_table_comment">"' + . htmlspecialchars($comment) + . '"</span>' . "\n"; + } // end if + } } } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_6-15-g1b812f2
by Marc Delisle 30 Aug '10

30 Aug '10

The branch, QA_3_3 has been updated via 1b812f2d25189b4903028d7f98793542559b1d14 (commit) from 73ce5705bd1e0b62060f75702d62f88247ce09dd (commit) - Log ----------------------------------------------------------------- commit 1b812f2d25189b4903028d7f98793542559b1d14 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 30 12:54:12 2010 -0400 undefined variables after deleting a user ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d5b38cc..610438c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1080,6 +1080,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice') // Basic url query part $url_params = array(); + if (! isset($GLOBALS['db'])) { + $GLOBALS['db'] = ''; + } if (strlen($GLOBALS['db'])) { $url_params['db'] = $GLOBALS['db']; if (strlen($GLOBALS['table'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. bcbcfd5e66c112a8e8a48fc873a18c22864d5dc2
by Michal Čihař 30 Aug '10

30 Aug '10

The branch, master has been updated via bcbcfd5e66c112a8e8a48fc873a18c22864d5dc2 (commit) from 4879bee1c7309200dbccffcce54e540b1ecf5965 (commit) - Log ----------------------------------------------------------------- commit bcbcfd5e66c112a8e8a48fc873a18c22864d5dc2 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Aug 30 17:52:22 2010 +0200 Add PMASA-2010-6 for 3.3.6. ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2010-6 | 53 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 templates/security/PMASA-2010-6 diff --git a/templates/security/PMASA-2010-6 b/templates/security/PMASA-2010-6 new file mode 100644 index 0000000..235c977 --- /dev/null +++ b/templates/security/PMASA-2010-6 @@ -0,0 +1,53 @@ +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + +<py:def function="announcement_id"> +PMASA-2010-6 +</py:def> + +<py:def function="announcement_date"> +2010-08-30 +</py:def> + +<py:def function="announcement_summary"> +XSS attack using debugging messages. +</py:def> + +<py:def function="announcement_description"> +It was possible to conduct a XSS attack using error messages in PHP backtrace. +</py:def> + +<py:def function="announcement_mitigation"> +Additional steps from administrator are required to actually exploit this +issue (phpMyAdmin error reporting and collection needs to be enabled, what +is against recommendation for production setup). +</py:def> + +<py:def function="announcement_severity"> +We consider this vulnerability to be non critical. +</py:def> + +<py:def function="announcement_affected"> +For 3.x: versions before 3.3.6 are affected. +</py:def> + +<py:def function="announcement_unaffected"> +Branch 2.11.x is not affected by this. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.3.6 or newer or apply patch listed below. +</py:def> + +<py:def function="announcement_references"> +Thanks to Aung Khant from <a href="http://yehg.net">YGN Ethical Hacker Group, +Myanmar</a> for reporting this issue. +</py:def> + +<py:def function="announcement_cve">CVE-2010-3056</py:def> + +<py:def function="announcement_commits"> +133a77fac7d31a38703db2099a90c1b49de62e37 +</py:def> + +<xi:include href="_page.tpl" /> +</html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9325-gb58db4c
by Michal Čihař 30 Aug '10

30 Aug '10

The branch, master has been updated via b58db4c2e7da52e72baae907c180ed71200e1249 (commit) via 73ce5705bd1e0b62060f75702d62f88247ce09dd (commit) from 0bf02f05f14065bc4f67218f9c089099fad41cb1 (commit) - Log ----------------------------------------------------------------- commit b58db4c2e7da52e72baae907c180ed71200e1249 Merge: 0bf02f05f14065bc4f67218f9c089099fad41cb1 73ce5705bd1e0b62060f75702d62f88247ce09dd Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Aug 30 17:30:47 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + setup/frames/index.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23ee447..682a8d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ $Id$ a page size increase, thanks to Martin Schönberger - mad05 - bug #3054458 [core] Fixed displaying number of rows. - bug #3035300 [parser] Fixed wrong definition of keywords. +- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 1b1285c..00723cd 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -117,7 +117,7 @@ display_form_top('index.php', 'get', array( <?php foreach ($cf->getServers() as $id => $server): ?> <tr> <td><?php echo $id ?></td> - <td><?php echo $cf->getServerName($id) ?></td> + <td><?php echo htmlspecialchars($cf->getServerName($id)) ?></td> <td><?php echo htmlspecialchars($cf->getValue("Servers/$id/auth_type")) ?></td> <td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td> <td style="white-space: nowrap"> hooks/post-receive -- phpMyAdmin

1 0