From 09eac127e7f1ced236ac06fe29346c2b7231f1ce Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Thu, 25 Apr 2013 17:25:15 +0200 Subject: [PATCH 1/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2605 of 2605) --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 88b9941afe..19e7ef13e8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-24 23:04+0200\n" +"PO-Revision-Date: 2013-04-25 17:25+0200\n" "Last-Translator: Rodrigo Souza \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -585,7 +585,7 @@ msgstr "Anel interno" #: gis_data_editor.php:303 msgid "Add a linestring" -msgstr "Adicionar uma linha" +msgstr "Adicionar uma cadeia de linha" #: gis_data_editor.php:304 gis_data_editor.php:378 js/messages.php:319 msgid "Add an inner ring" From be11d75f16647221692c8efddfa91fb21d50defa Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 25 Apr 2013 21:22:14 +0200 Subject: [PATCH 2/5] Hide hosts, usernames and passwords when displaying calls to *_connect functions in the backtrace --- libraries/Error.class.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 059fbca11b..1c25a4911a 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -300,9 +300,20 @@ class PMA_Error extends PMA_Message 'require', 'require_once', ); + $connect_functions = array( + 'mysql_connect', + 'mysql_pconnect', + 'mysqli_connect', + 'mysqli_real_connect', + 'PMA_DBI_connect', + 'PMA_DBI_real_connect', + ); if (in_array($function, $include_functions)) { $retval .= PMA_Error::relPath($arg); + } elseif (in_array($function, $connect_functions) + && getType($arg) === 'string') { + $retval .= getType($arg) . ' ********'; } elseif (is_scalar($arg)) { $retval .= getType($arg) . ' ' . htmlspecialchars($arg); } else { From 14cadcbb30bf1ffb8e9a6bdcda24c4296b522328 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 25 Apr 2013 21:50:14 +0200 Subject: [PATCH 3/5] Apply PEAR coding standard to multiline elseif --- libraries/Error.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 1c25a4911a..e2c013328a 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -312,7 +312,8 @@ class PMA_Error extends PMA_Message if (in_array($function, $include_functions)) { $retval .= PMA_Error::relPath($arg); } elseif (in_array($function, $connect_functions) - && getType($arg) === 'string') { + && getType($arg) === 'string' + ) { $retval .= getType($arg) . ' ********'; } elseif (is_scalar($arg)) { $retval .= getType($arg) . ' ' . htmlspecialchars($arg); From 813d6215e34f35c34b867eb596df76fc2b845856 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 25 Apr 2013 22:16:11 +0200 Subject: [PATCH 4/5] Translated using Weblate (French) Currently translated at 100.0% (2605 of 2605) --- po/fr.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0c517182fe..6ed285f8d7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-02 17:10+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: French \n" +"PO-Revision-Date: 2013-04-25 22:16+0200\n" +"Last-Translator: Marc Delisle \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 #: libraries/DisplayResults.class.php:809 @@ -117,7 +116,7 @@ msgstr "La base de données %1$s a été créée." #: db_datadict.php:51 libraries/operations.lib.php:32 msgid "Database comment: " -msgstr "Commentaire sur la base de données: " +msgstr "Commentaire sur la base de données : " #: db_datadict.php:157 libraries/operations.lib.php:784 #: libraries/schema/Pdf_Relation_Schema.class.php:1332 From 90a2ccbce51cf535b090aafa4dea84ade4faf058 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 25 Apr 2013 21:29:30 -0400 Subject: [PATCH 5/5] ChangeLog entry for "Hide login data in backtrace" --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3f1e58dc4e..74c50c9990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.0.1.0 (not yet released) - bug #3879 Import broken for CSV using LOAD DATA +- bug When login fails and error display is active, login data is displayed 4.0.0.0 (not yet released) + Patch #3481047 for rfe #3480477 Insert as new row enhancement