From 75479d179687c11eb38e2b27a402219639241a84 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 12 Sep 2013 14:24:29 +0200 Subject: [PATCH 1/3] Translated using Weblate (French) Currently translated at 100.0% (2610 of 2610) --- po/fr.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8f1cb40e47..e30183ce5d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ 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-09-12 10:04+0200\n" -"PO-Revision-Date: 2013-08-01 14:19+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-09-12 14:24+0200\n" +"Last-Translator: Marc Delisle \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -1364,6 +1364,8 @@ msgstr "Depuis le journal général" #: js/messages.php:159 msgid "The database name is not known for this query in the server's logs." msgstr "" +"Le nom de la base de données n'est pas connu pour cette requête dans les " +"logs du serveur." #: js/messages.php:160 msgid "Analysing logs" @@ -6359,7 +6361,7 @@ msgstr "possible attaque récursive" #: libraries/database_interface.lib.php:63 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Voyez %snotre documentation%s pour plus de détails." #: libraries/database_interface.lib.php:2080 msgid "" From 567ea0fa75f1071ed21c7e17d6f5f91cc7378420 Mon Sep 17 00:00:00 2001 From: Guillermo Lisotti Date: Thu, 12 Sep 2013 14:23:39 +0200 Subject: [PATCH 2/3] Translated using Weblate (Spanish) Currently translated at 100.0% (2610 of 2610) --- po/es.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 3610563f3a..ad197aeda1 100644 --- a/po/es.po +++ b/po/es.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.7-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-09-12 10:04+0200\n" -"PO-Revision-Date: 2013-08-11 13:39+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-09-12 14:23+0200\n" +"Last-Translator: Guillermo Lisotti \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" @@ -1371,6 +1371,8 @@ msgstr "Del registro general" #: js/messages.php:159 msgid "The database name is not known for this query in the server's logs." msgstr "" +"En los registros del servidor no se reconoce el nombre de la base de datos " +"de esta consulta." #: js/messages.php:160 msgid "Analysing logs" @@ -6411,7 +6413,7 @@ msgstr "posible ataque de recursión extrema" #: libraries/database_interface.lib.php:63 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Ver %sour documentation%s para más información." #: libraries/database_interface.lib.php:2080 msgid "" From be6a7948996c6e407b29e3f1a36de426f0103694 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 13 Sep 2013 17:24:32 +0530 Subject: [PATCH 3/3] bug #4089 Moving Columns will alter column definition --- ChangeLog | 1 + libraries/structure.lib.php | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9039d847a..cc22dd53aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4080 Overwrite existing file not obeyed - bug #3929 Database-specific privileges are not copied when cloning user - bug #3997 Error handling in case MySQL extension is missing +- bug #4089 Moving Columns will alter column definition 4.0.6.0 (2013-09-05) - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index bed7869ef2..2d9fab94a2 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2458,7 +2458,9 @@ function PMA_moveColumns($db, $table) unset($data['Extra']); } $current_timestamp = false; - if ($data['Type'] == 'timestamp' && $data['Default'] == 'CURRENT_TIMESTAMP') { + if (($data['Type'] == 'timestamp' || $data['Type'] == 'datetime') + && $data['Default'] == 'CURRENT_TIMESTAMP' + ) { $current_timestamp = true; } $default_type @@ -2466,7 +2468,7 @@ function PMA_moveColumns($db, $table) ? 'NULL' : ($current_timestamp ? 'CURRENT_TIMESTAMP' - : ($data['Default'] == '' + : ($data['Default'] === null ? 'NONE' : 'USER_DEFINED'));