24 Jan
2012
24 Jan
'12
8:42 p.m.
The branch, TESTING has been updated
via 6bf8d6c83aefa51c99822aa2ef69462cb2deca85 (commit)
via 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit)
via 3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit)
via 5da1aaa0fe7493afecde8ac92a0b561337bf217e (commit)
via 346c70d6fd7a6e402e41dfd552f70e3bdaf83323 (commit)
via 5d1fa1cc6b9cd6b2a96a67cd79216354a3c3e77f (commit)
from 2902ec086b6d8e1158cd869512aa0579aeb6509c (commit)
- Log -----------------------------------------------------------------
commit 6bf8d6c83aefa51c99822aa2ef69462cb2deca85
Merge: 2902ec0 6d58b78
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Jan 24 12:33:46 2012 -0500
Merge branch 'MAINT_3_4_10' into TESTING
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +
Documentation.html | 4 +-
README | 2 +-
libraries/Config.class.php | 2 +-
libraries/tbl_replace_fields.inc.php | 8 ++-
po/lt.po | 14 +++--
po/ta.po | 23 +++----
po/te.po | 2 +-
po/th.po | 106 +++++++++++++++++-----------------
tbl_replace.php | 14 ++++-
10 files changed, 98 insertions(+), 79 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c5622a1..ebc96e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,8 @@ phpMyAdmin - ChangeLog
- bug #3049209 [import] Import from ODS ignores cell that is the same as cell before
- bug #3463933 [display] SELECT DISTINCT displays wrong total records found
- patch #3458944 [operations] copy table data missing SET
SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
+- bug #3469254 [edit] Setting data to NULL and drop-downs
+- bug #3477063 [edit] Missing set fields and values in generated INSERT query
3.4.9.0 (2011-12-21)
- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
diff --git a/Documentation.html b/Documentation.html
index 85d19f6..021db02 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,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.5.0-alpha1 - Documentation</title>
+ <title>phpMyAdmin 3.4.10-rc1 - Documentation</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -17,7 +17,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.5.0-alpha1
+ 3.4.10-rc1
Documentation
</h1>
</div>
diff --git a/README b/README
index e722ded..f3ced24 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.5.0-alpha1
+Version 3.4.10-rc1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f4a05b5..bd89194 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -98,7 +98,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.5.0-alpha1');
+ $this->set('PMA_VERSION', '3.4.10-rc1');
/**
* @deprecated
*/
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index 8e27290..07e2d61 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -59,17 +59,19 @@ if (false !== $possibly_uploaded_val) {
}
// $key contains the md5() of the fieldname
- if (0 === strlen($val) && $type != 'protected') {
+ if ($type != 'protected' && $type != 'set' && 0 ===
strlen($val)) {
// best way to avoid problems in strict mode (works also in non-strict mode)
if (isset($me_auto_increment) && isset($me_auto_increment[$key])) {
$val = 'NULL';
} else {
$val = "''";
- }
+ }
} elseif ($type == 'set') {
if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key]))
{
$val = implode(',',
$_REQUEST['fields']['multi_edit'][$rownumber][$key]);
- $val = "'" . PMA_sqlAddSlashes($val) . "'";
+ $val = "'" . PMA_sqlAddslashes($val) . "'";
+ } else {
+ $val = "''";
}
} elseif ($type == 'protected') {
// here we are in protected mode (asked in the config)
diff --git a/po/lt.po b/po/lt.po
index cea9e06..180be49 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3678,11 +3678,13 @@ msgstr "Pratęsta lentelės antraštė"
msgid "Label key"
msgstr "Pavadinimo raktas"
-#: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112
-#: libraries/config/messages.inc.php:136 libraries/export/odt.php:324
-#: libraries/tbl_properties.inc.php:135
-msgid "MIME type"
-msgstr "MIME tipas"
+#: libraries/config/messages.inc.php:324
+msgid ""
+"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, "
+"DATETIME and TIMESTAMP, ascending order otherwise"
+msgstr ""
+"[kbd]SMART[/kbd] - t.y. mažėjantis rikiavimas stulpeliams kurių tipai TIME, "
+"DATE, DATETIME ir TIMESTAMP, didėjantis kitu atveju"
#: libraries/config/messages.inc.php:102 libraries/config/messages.inc.php:114
#: libraries/config/messages.inc.php:138 tbl_relation.php:392
@@ -6547,6 +6549,8 @@ msgstr "PDF"
#: libraries/export/pdf.php:24
msgid "(Generates a report containing the data of a single table)"
msgstr ""
+"Palikite tuščią, kad nebūtų PDF schemos palaikymo, siūlome: [kbd]"
+"pma_table_coords[/kbd]"
#: libraries/export/pdf.php:25
msgid "Report title:"
diff --git a/po/ta.po b/po/ta.po
index 4f55e58..d8b326d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -11115,9 +11115,10 @@ msgstr ""
msgid "Comment out these two lines if you do not need them."
msgstr ""
-#: tbl_tracking.php:215
-msgid "SQL statements exported. Please copy the dump or execute it."
-msgstr ""
+#: server_status.php:516 server_status.php:561 server_status.php:626
+#: server_status.php:687
+msgid "per hour"
+msgstr "ஒரு மணி நேரத்திற்கு "
#: tbl_tracking.php:246
#, php-format
@@ -11145,17 +11146,13 @@ msgstr ""
msgid "Show %s with dates from %s to %s by user %s %s"
msgstr ""
-#: tbl_tracking.php:438
-msgid "Delete tracking data row from report"
-msgstr ""
-
-#: tbl_tracking.php:449
-msgid "No data"
-msgstr "தரவு இல்லை"
+#: server_status.php:627
+msgid "per minute"
+msgstr "ஒரு நிமிடத்திற்கு "
-#: tbl_tracking.php:459 tbl_tracking.php:516
-msgid "Date"
-msgstr "திகதி"
+#: server_status.php:628
+msgid "per second"
+msgstr "ஒரு வினாடிக்கு"
#: tbl_tracking.php:461
msgid "Data definition statement"
diff --git a/po/te.po b/po/te.po
index b1a9418..270a8ba 100644
--- a/po/te.po
+++ b/po/te.po
@@ -86,7 +86,7 @@ msgstr "వెళ్ళు"
#: browse_foreigners.php:174 browse_foreigners.php:178
#: libraries/Index.class.php:440 tbl_tracking.php:319
msgid "Keyname"
-msgstr ""
+msgstr "కీలకపదం"
#: browse_foreigners.php:175 browse_foreigners.php:177
#: server_collations.php:54 server_collations.php:66 server_engines.php:55
diff --git a/po/th.po b/po/th.po
index 24f4f97..be1d174 100644
--- a/po/th.po
+++ b/po/th.po
@@ -10168,17 +10168,17 @@ msgstr ""
msgid "The total number of data writes."
msgstr ""
-#: server_status.php:1341
-msgid "The amount of data written so far, in bytes."
-msgstr ""
+#: server_binlog.php:200
+msgid "Position"
+msgstr "ตำแหน่ง"
#: server_status.php:1342
msgid "The number of pages that have been written for doublewrite operations."
msgstr ""
-#: server_status.php:1343
-msgid "The number of doublewrite operations that have been performed."
-msgstr ""
+#: server_binlog.php:203
+msgid "Original position"
+msgstr "ตำแหน่งเริ่มแรก"
#: server_status.php:1344
msgid ""
@@ -11747,20 +11747,17 @@ msgstr "ชนิดคำค้น"
msgid "Tracking data manipulation successfully deleted"
msgstr ""
-#: tbl_tracking.php:417
-msgid "Tracking statements"
-msgstr ""
+#: server_synchronize.php:429 server_synchronize.php:872
+msgid "Apply index(s)"
+msgstr "ดัชนี"
-#: tbl_tracking.php:433 tbl_tracking.php:561
-#, php-format
-msgid "Show %s with dates from %s to %s by user %s %s"
-msgstr ""
+#: server_synchronize.php:430 server_synchronize.php:873
+msgid "Update row(s)"
+msgstr "อัพเดทแถว"
-#: tbl_tracking.php:438
-#, fuzzy
-#| msgid "Delete tracking data for this table"
-msgid "Delete tracking data row from report"
-msgstr "ลบการติดตามตารางนี้"
+#: server_synchronize.php:431 server_synchronize.php:874
+msgid "Insert row(s)"
+msgstr "เพิ่มแถว"
#: tbl_tracking.php:449
#, fuzzy
@@ -11773,13 +11770,13 @@ msgstr "ไม่มีฐานข้อมูล"
msgid "Date"
msgstr "ข้อมูล"
-#: tbl_tracking.php:461
-msgid "Data definition statement"
-msgstr ""
+#: server_synchronize.php:444 server_synchronize.php:889
+msgid "Apply Selected Changes"
+msgstr "ใช้การเปลี่ยนแปลงที่เลือก"
-#: tbl_tracking.php:518
-msgid "Data manipulation statement"
-msgstr ""
+#: server_synchronize.php:446 server_synchronize.php:891
+msgid "Synchronize Databases"
+msgstr "ทำให้ฐานข้อมูลเท่ากัน"
#: tbl_tracking.php:564
msgid "SQL dump (file download)"
@@ -11873,14 +11870,9 @@ msgstr ""
msgid "Get more themes!"
msgstr ""
-#: transformation_overview.php:24
-msgid "Available MIME types"
-msgstr "MIME-types ที่มีอยู่"
-
-#: transformation_overview.php:37
-msgid ""
-"MIME types printed in italics do not have a separate transformation function"
-msgstr ""
+#: setup/frames/index.inc.php:212
+msgid "Display"
+msgstr "แสดง"
#: transformation_overview.php:42
msgid "Available transformations"
@@ -11893,26 +11885,22 @@ msgctxt "for MIME transformation"
msgid "Description"
msgstr "รายละเอียด"
-#: user_password.php:34
-msgid "You don't have sufficient privileges to be here right now!"
-msgstr "คุณไม่มีสิทธิที่จะเข้ามาตรงนี้!"
-
-#: user_password.php:96
-msgid "The profile has been updated."
-msgstr "ปรับปรุงโพรไฟล์เรียบร้อยแล้ว"
+#: setup/frames/index.inc.php:228
+msgid "Donate"
+msgstr "บริจาค"
-#: view_create.php:141
-msgid "VIEW name"
-msgstr ""
+#: setup/frames/servers.inc.php:28
+msgid "Edit server"
+msgstr "แก้ไข เครื่องแม่ข่าย"
#: view_operations.php:91
#, fuzzy
msgid "Rename view to"
msgstr "เปลี่ยนชื่อตารางเป็น"
-#: po/advisory_rules.php:5
-msgid "Uptime below one day"
-msgstr ""
+#: setup/lib/form_processing.lib.php:42
+msgid "Warning"
+msgstr "คำเตือน"
#: po/advisory_rules.php:6
msgid "Uptime is less than 1 day, performance tuning may not be accurate."
@@ -12522,10 +12510,24 @@ msgstr ""
#: po/advisory_rules.php:153
#, php-format
-msgid ""
-"%s%% of all temporary tables are being written to disk, this value should be
"
-"below 25%%"
-msgstr ""
+msgid "Table %s has been flushed"
+msgstr "ล้างตาราง %s เรียบร้อยแล้ว"
+
+#: tbl_operations.php:664
+#, fuzzy
+#| msgid "Flush the table (\"FLUSH\")"
+msgid "Flush the table (FLUSH)"
+msgstr "ล้างตาราง (flush)"
+
+#: tbl_operations.php:673
+#, fuzzy
+#| msgid "Dumping data for table"
+msgid "Delete data or table"
+msgstr "dump ตาราง"
+
+#: tbl_operations.php:688
+msgid "Empty the table (TRUNCATE)"
+msgstr "ลบข้อมูลตาราง (TRUNCATE)"
#: po/advisory_rules.php:155
#, fuzzy
@@ -12552,9 +12554,9 @@ msgid ""
"less than 1 per hour"
msgstr ""
-#: po/advisory_rules.php:160
-msgid "MyISAM key buffer size"
-msgstr ""
+#: tbl_operations.php:740
+msgid "Analyze"
+msgstr "วิเคราะห์"
#: po/advisory_rules.php:161
msgid "Key buffer is not initialized. No MyISAM indexes will be cached."
diff --git a/tbl_replace.php b/tbl_replace.php
index 60dc7cf..6ba156d 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -223,7 +223,19 @@ foreach ($loop_array as $rownumber => $where_clause) {
if ($is_insert && $using_key && isset($me_fields_type) &&
is_array($me_fields_type) && isset($where_clause)) {
$prot_row = PMA_DBI_fetch_single_row('SELECT * FROM ' .
PMA_backquote($table) . ' WHERE ' . $where_clause . ';');
}
- foreach ($me_fields as $key => $val) {
+
+ // When a select field is nullified, it's not present in $_REQUEST
+ // so initialize it; this way, the foreach($me_fields) will process it
+ foreach ($me_fields_name as $key => $val) {
+ if (! isset($me_fields[$key])) {
+ $me_fields[$key] = '';
+ }
+ }
+
+ // Iterate in the order of $me_fields_name, not $me_fields, to avoid problems
+ // when inserting multiple entries
+ foreach ($me_fields_name as $key => $field_name) {
+ $val = $me_fields[$key];
// Note: $key is an md5 of the fieldname. The actual fieldname is available in
$me_fields_name[$key]
hooks/post-receive
--
phpMyAdmin