Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2012-05-03 10:59:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2012-04-12 09:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2012-05-03 10:59:46.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 26 19:49:16 UTC 2012 - [email protected] + +- update to 3.4.11.0 + * bug sf#3486970 [import] Exception on XML import + * bug sf#3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names + in navigation + * bug sf#3512565 [navi] Fixed missing word "Rows" in table list + tooltip after click + +------------------------------------------------------------------- Old: ---- phpMyAdmin-3.4.10.2-all-languages.tar.bz2 New: ---- phpMyAdmin-3.4.11-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.Z6wJ6C/_old 2012-05-03 10:59:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Z6wJ6C/_new 2012-05-03 10:59:48.000000000 +0200 @@ -34,7 +34,7 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 3.4.10.2 +Version: 3.4.11 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 ++++++ phpMyAdmin-3.4.10.2-all-languages.tar.bz2 -> phpMyAdmin-3.4.11-all-languages.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/ChangeLog new/phpMyAdmin-3.4.11-all-languages/ChangeLog --- old/phpMyAdmin-3.4.10.2-all-languages/ChangeLog 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/ChangeLog 2012-04-14 13:42:20.000000000 +0200 @@ -1,6 +1,11 @@ phpMyAdmin - ChangeLog ====================== +3.4.11.0 (2012-04-14) +- bug #3486970 [import] Exception on XML import +- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation +- bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click + 3.4.10.2 (2012-03-28) - [security] Fixed local path disclosure vulnerability, see PMASA-2012-2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/Documentation.html new/phpMyAdmin-3.4.11-all-languages/Documentation.html --- old/phpMyAdmin-3.4.10.2-all-languages/Documentation.html 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/Documentation.html 2012-04-14 13:42:20.000000000 +0200 @@ -9,7 +9,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.4.10.2 - Documentation</title> + <title>phpMyAdmin 3.4.11 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/";>php<span class="myadmin">MyAdmin</span></a> - 3.4.10.2 + 3.4.11 Documentation </h1> </div> @@ -4352,7 +4352,7 @@ Documentation is being translated using po4a and gettext (see <a href="http://www.phpmyadmin.net/home_page/docs.php";>documentation</a> for existing translations). To start, checkout - <a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po";><code>localized_docs/po</code></a> + <a href="http://github.com/phpmyadmin/localized_docs/tree/master/po";><code>localized_docs/po</code></a> from Git, or just go to the <a href="https://l10n.cihar.com/projects/pmadoc/";>translation server</a> and translate it online. If your language is missing, just contact <a href="mailto:[email protected]";>Michal Čihař</a>; he will add it. If @@ -4367,8 +4367,7 @@ <p> The following method is preferred for new developers:</p> <ol><li>fetch the current git repository over anonymous git:<br /> - <tt>git clone - git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt><br /> + <tt>git clone git://github.com/phpmyadmin/phpmyadmin.git</tt><br /> </li> <li>add your stuff</li> <li>generate patch with your changes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/Documentation.txt new/phpMyAdmin-3.4.11-all-languages/Documentation.txt --- old/phpMyAdmin-3.4.10.2-all-languages/Documentation.txt 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/Documentation.txt 2012-04-14 13:42:20.000000000 +0200 @@ -1,4 +1,4 @@ -phpMyAdmin 3.4.10.2 Documentation +phpMyAdmin 3.4.11 Documentation * Top * Requirements @@ -3226,8 +3226,7 @@ The following method is preferred for new developers: 1. fetch the current git repository over anonymous git: - git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/ - phpmyadmin + git clone git://github.com/phpmyadmin/phpmyadmin.git 2. add your stuff 3. generate patch with your changes: git diff > xxx.diff 4. submit your patch via the patch tracker of the phpMyAdmin project. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/README new/phpMyAdmin-3.4.11-all-languages/README --- old/phpMyAdmin-3.4.10.2-all-languages/README 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/README 2012-04-14 13:42:20.000000000 +0200 @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.10.2 +Version 3.4.11 A set of PHP-scripts to manage MySQL over the web. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/RELEASE-DATE-3.4.10.2 new/phpMyAdmin-3.4.11-all-languages/RELEASE-DATE-3.4.10.2 --- old/phpMyAdmin-3.4.10.2-all-languages/RELEASE-DATE-3.4.10.2 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/RELEASE-DATE-3.4.10.2 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Wed Mar 28 16:49:29 UTC 2012 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/RELEASE-DATE-3.4.11 new/phpMyAdmin-3.4.11-all-languages/RELEASE-DATE-3.4.11 --- old/phpMyAdmin-3.4.10.2-all-languages/RELEASE-DATE-3.4.11 1970-01-01 01:00:00.000000000 +0100 +++ new/phpMyAdmin-3.4.11-all-languages/RELEASE-DATE-3.4.11 2012-04-14 13:42:20.000000000 +0200 @@ -0,0 +1 @@ +Sat Apr 14 11:41:12 UTC 2012 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/changelog.php new/phpMyAdmin-3.4.11-all-languages/changelog.php --- old/phpMyAdmin-3.4.10.2-all-languages/changelog.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/changelog.php 2012-04-14 13:42:20.000000000 +0200 @@ -64,7 +64,7 @@ // linking files '/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i' - => '\\1<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=history;f=\\2;hb=HEAD";>\\2</a>', + => '\\1<a href="https://github.com/phpmyadmin/phpmyadmin/commits/HEAD/\\2";>\\2</a>', // FAQ entries '/FAQ ([0-9]+)\.([0-9a-z]+)/i' @@ -84,9 +84,9 @@ // Highlight releases (with links) '/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/' - => '<a name="\\1_\\2_\\3"></a><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=shortlog;h=refs/tags/RELEASE_\\1_\\2_\\3";>\\1.\\2.\\3.0 \\4</a>', + => '<a name="\\1_\\2_\\3"></a><a href="https://github.com/phpmyadmin/phpmyadmin/commits/RELEASE_\\1_\\2_\\3";>\\1.\\2.\\3.0 \\4</a>', '/([0-9]+)\.([0-9]+)\.([0-9]+)\.([1-9][0-9]*) (\([0-9-]+\))/' - => '<a name="\\1_\\2_\\3_\\4"></a><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=shortlog;h=refs/tags/RELEASE_\\1_\\2_\\3_\\4";>\\1.\\2.\\3.\\4 \\5</a>', + => '<a name="\\1_\\2_\\3_\\4"></a><a href="https://github.com/phpmyadmin/phpmyadmin/commits/RELEASE_\\1_\\2_\\3_\\4";>\\1.\\2.\\3.\\4 \\5</a>', // Highlight releases (not linkable) '/( ### )(.*)/' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/db_tracking.php new/phpMyAdmin-3.4.11-all-languages/db_tracking.php --- old/phpMyAdmin-3.4.10.2-all-languages/db_tracking.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/db_tracking.php 2012-04-14 13:42:20.000000000 +0200 @@ -161,7 +161,7 @@ foreach ($value as $temp_table) { // If $temp_table is a table with the value for 'Name' is set, // rather than a propery of the table group. - if (array_key_exists('Name', $temp_table)) { + if (is_array($temp_table) && array_key_exists('Name', $temp_table)) { if (PMA_Tracker::getVersion($GLOBALS['db'], $temp_table['Name']) == -1) { $my_tables[] = $temp_table['Name']; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/Config.class.php new/phpMyAdmin-3.4.11-all-languages/libraries/Config.class.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/Config.class.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/Config.class.php 2012-04-14 13:42:20.000000000 +0200 @@ -96,7 +96,7 @@ */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.10.2'); + $this->set('PMA_VERSION', '3.4.11'); /** * @deprecated */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/Error.class.php new/phpMyAdmin-3.4.11-all-languages/libraries/Error.class.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/Error.class.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/Error.class.php 2012-04-14 13:42:20.000000000 +0200 @@ -169,13 +169,18 @@ */ public function getHash() { + try { + $backtrace = serialize($this->getBacktrace()); + } catch(Exception $e){ + $backtrace = ''; + } if (null === $this->_hash) { $this->_hash = md5( $this->getNumber() . $this->getMessage() . $this->getFile() . $this->getLine() . - serialize($this->getBacktrace()) + $backtrace ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/Error_Handler.class.php new/phpMyAdmin-3.4.11-all-languages/libraries/Error_Handler.class.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/Error_Handler.class.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/Error_Handler.class.php 2012-04-14 13:42:20.000000000 +0200 @@ -116,7 +116,7 @@ public function handleError($errno, $errstr, $errfile, $errline) { // create error object - $error = new PMA_Error($errno, $errstr, $errfile, $errline); + $error = new PMA_Error($errno, htmlspecialchars($errstr), $errfile, $errline); // do not repeat errors $this->_errors[$error->getHash()] = $error; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/Table.class.php new/phpMyAdmin-3.4.11-all-languages/libraries/Table.class.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/Table.class.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/Table.class.php 2012-04-14 13:42:20.000000000 +0200 @@ -265,7 +265,7 @@ static public function sGetToolTip($db, $table) { return PMA_Table::sGetStatusInfo($db, $table, 'Comment') - . ' (' . PMA_Table::countRecords($db, $table) . ')'; + . ' (' . PMA_Table::countRecords($db, $table) . ' ' . __('Rows') . ')'; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/common.lib.php new/phpMyAdmin-3.4.11-all-languages/libraries/common.lib.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/common.lib.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/common.lib.php 2012-04-14 13:42:20.000000000 +0200 @@ -809,7 +809,9 @@ if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested' + && $table['Comment'] // do not switch if the comment is empty + ) { // switch tooltip and name $table['disp_name'] = $table['Comment']; $table['Comment'] = $table['Name']; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/config/ConfigFile.class.php new/phpMyAdmin-3.4.11-all-languages/libraries/config/ConfigFile.class.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/config/ConfigFile.class.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/config/ConfigFile.class.php 2012-04-14 13:42:20.000000000 +0200 @@ -116,7 +116,7 @@ /** * Returns PMA_Config without user preferences applied - * + * * @return PMA_Config */ public function getOrgConfigObj() @@ -422,10 +422,10 @@ } $verbose = $this->get("Servers/$id/verbose"); if (!empty($verbose)) { - return htmlspecialchars($verbose); + return $verbose; } $host = $this->get("Servers/$id/host"); - return empty($host) ? 'localhost' : htmlspecialchars($host); + return empty($host) ? 'localhost' : $host; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/import/xml.php new/phpMyAdmin-3.4.11-all-languages/libraries/import/xml.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/import/xml.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/import/xml.php 2012-04-14 13:42:20.000000000 +0200 @@ -186,7 +186,7 @@ /** * Only attempt to analyze/collect data if there is data present */ -if (@count($xml->children())) { +if ($xml && @$xml->count()) { $data_present = true; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/libraries/language_stats.inc.php new/phpMyAdmin-3.4.11-all-languages/libraries/language_stats.inc.php --- old/phpMyAdmin-3.4.10.2-all-languages/libraries/language_stats.inc.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/libraries/language_stats.inc.php 2012-04-14 13:42:20.000000000 +0200 @@ -3,65 +3,65 @@ /* Generated by scripts/remove-incomplete-mo */ $GLOBALS["language_stats"] = array ( - 'af' => 16, - 'ar' => 49, - 'az' => 26, + 'af' => 15, + 'ar' => 54, + 'az' => 23, 'be@latin' => 48, 'be' => 48, - 'bg' => 66, - 'bn' => 42, + 'bg' => 69, + 'bn' => 25, 'br' => 31, 'bs' => 26, - 'ca' => 99, + 'ca' => 100, 'cs' => 100, 'cy' => 37, - 'da' => 86, - 'de' => 99, + 'da' => 98, + 'de' => 100, 'el' => 99, - 'en_GB' => 99, - 'es' => 99, - 'et' => 44, + 'en_GB' => 100, + 'es' => 100, + 'et' => 100, 'eu' => 28, 'fa' => 19, - 'fi' => 79, - 'fr' => 99, - 'gl' => 71, + 'fi' => 82, + 'fr' => 100, + 'gl' => 76, 'he' => 27, - 'hi' => 77, - 'hr' => 48, - 'hu' => 83, - 'id' => 73, + 'hi' => 76, + 'hr' => 54, + 'hu' => 91, + 'id' => 84, 'it' => 99, 'ja' => 99, - 'ka' => 64, - 'ko' => 29, - 'lt' => 83, + 'ka' => 30, + 'ko' => 34, + 'lt' => 86, 'lv' => 29, 'mk' => 33, 'ml' => 3, - 'mn' => 40, + 'mn' => 39, 'ms' => 18, 'nb' => 88, - 'nl' => 99, - 'pl' => 87, - 'pt_BR' => 70, - 'pt' => 37, - 'ro' => 52, - 'ru' => 99, - 'si' => 74, - 'sk' => 70, - 'sl' => 99, + 'nl' => 100, + 'pl' => 98, + 'pt_BR' => 82, + 'pt' => 40, + 'ro' => 67, + 'ru' => 100, + 'si' => 77, + 'sk' => 85, + 'sl' => 100, 'sq' => 29, 'sr@latin' => 46, 'sr' => 45, - 'sv' => 99, - 'ta' => 16, + 'sv' => 100, + 'ta' => 17, 'te' => 18, - 'th' => 29, - 'tr' => 99, - 'tt' => 35, - 'ug' => 22, - 'uk' => 55, + 'th' => 36, + 'tr' => 100, + 'tt' => 33, + 'ug' => 21, + 'uk' => 58, 'ur' => 38, 'uz@latin' => 72, 'uz' => 72, Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/be@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/be@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/pt/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/pt/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/uz@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/uz@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.10.2-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.11-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/scripts/decode_bug.php new/phpMyAdmin-3.4.11-all-languages/scripts/decode_bug.php --- old/phpMyAdmin-3.4.10.2-all-languages/scripts/decode_bug.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/scripts/decode_bug.php 2012-04-14 13:42:20.000000000 +0200 @@ -78,7 +78,7 @@ $bug_encoded = $_POST['bug_encoded']; } -if (!empty($bug_encoded)) { +if (!empty($bug_encoded) && is_string($bug_encoded)) { if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { $bug_encoded = stripslashes($bug_encoded); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/setup/lib/index.lib.php new/phpMyAdmin-3.4.11-all-languages/setup/lib/index.lib.php --- old/phpMyAdmin-3.4.10.2-all-languages/setup/lib/index.lib.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/setup/lib/index.lib.php 2012-04-14 13:42:20.000000000 +0200 @@ -279,6 +279,7 @@ if ($server_name == 'localhost') { $server_name .= " [$i]"; } + $server_name = htmlspecialchars($server_name); if ($cookie_auth_server && $blowfish_secret === null) { $blowfish_secret = uniqid('', true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/sql.php new/phpMyAdmin-3.4.11-all-languages/sql.php --- old/phpMyAdmin-3.4.10.2-all-languages/sql.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/sql.php 2012-04-14 13:42:20.000000000 +0200 @@ -721,6 +721,10 @@ parse_str($_REQUEST['transform_fields_list'], $edited_values); foreach($mime_map as $transformation) { + /* Ignore not set transformation (only MIME type set) */ + if (empty($transformation['transformation'])) { + continue; + } $include_file = PMA_securePath($transformation['transformation']); $column_name = $transformation['column_name']; $column_data = $edited_values[$column_name]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.10.2-all-languages/tbl_tracking.php new/phpMyAdmin-3.4.11-all-languages/tbl_tracking.php --- old/phpMyAdmin-3.4.10.2-all-languages/tbl_tracking.php 2012-03-28 18:50:38.000000000 +0200 +++ new/phpMyAdmin-3.4.11-all-languages/tbl_tracking.php 2012-04-14 13:42:20.000000000 +0200 @@ -180,7 +180,7 @@ $tracking_set = rtrim($tracking_set, ','); if (PMA_Tracker::createVersion($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set )) { - $msg = PMA_Message::success(sprintf(__('Version %s is created, tracking for %s.%s is activated.'), $_REQUEST['version'], htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']))); + $msg = PMA_Message::success(sprintf(__('Version %s is created, tracking for %s.%s is activated.'), htmlspecialchars($_REQUEST['version']), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']))); $msg->display(); } } @@ -188,7 +188,7 @@ // Deactivate tracking if (isset($_REQUEST['submit_deactivate_now'])) { if (PMA_Tracker::deactivateTracking($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'])) { - $msg = PMA_Message::success(sprintf(__('Tracking for %s.%s , version %s is deactivated.'), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']), $_REQUEST['version'])); + $msg = PMA_Message::success(sprintf(__('Tracking for %s.%s , version %s is deactivated.'), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']), htmlspecialchars($_REQUEST['version']))); $msg->display(); } } @@ -196,7 +196,7 @@ // Activate tracking if (isset($_REQUEST['submit_activate_now'])) { if (PMA_Tracker::activateTracking($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'])) { - $msg = PMA_Message::success(sprintf(__('Tracking for %s.%s , version %s is activated.'), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']), $_REQUEST['version'])); + $msg = PMA_Message::success(sprintf(__('Tracking for %s.%s , version %s is activated.'), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table']), htmlspecialchars($_REQUEST['version']))); $msg->display(); } } @@ -254,7 +254,7 @@ $drop_create_statements .= $data['ddlog'][1]['statement']; } // Print SQL code - PMA_showMessage(sprintf(__('Version %s snapshot (SQL code)'), $_REQUEST['version']), $drop_create_statements); + PMA_showMessage(sprintf(__('Version %s snapshot (SQL code)'), htmlspecialchars($_REQUEST['version'])), $drop_create_statements); // Unserialize snapshot $temp = unserialize($data['schema_snapshot']); ++++++ phpMyAdmin-3.4.9-config.patch ++++++ --- /var/tmp/diff_new_pack.Z6wJ6C/_old 2012-05-03 10:59:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Z6wJ6C/_new 2012-05-03 10:59:49.000000000 +0200 @@ -1,7 +1,7 @@ Index: config.sample.inc.php =================================================================== ---- config.sample.inc.php.orig 2011-12-21 21:07:53.000000000 +0100 -+++ config.sample.inc.php 2011-12-28 14:33:11.000000000 +0100 +--- config.sample.inc.php.orig ++++ config.sample.inc.php @@ -10,55 +10,223 @@ * @package phpMyAdmin */ @@ -259,8 +259,8 @@ Index: libraries/vendor_config.php =================================================================== ---- libraries/vendor_config.php.orig 2011-12-21 21:07:53.000000000 +0100 -+++ libraries/vendor_config.php 2011-12-28 14:35:48.000000000 +0100 +--- libraries/vendor_config.php.orig ++++ libraries/vendor_config.php @@ -14,18 +14,18 @@ * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
