From b6ae26a7a9334be01517ebe79a603ea9e4cb0ede Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Mon, 1 Apr 2013 22:56:43 +0200
Subject: [PATCH 1/3] improve coding style : echo does not need parenthesis

---
 tbl_gis_visualization.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index bd95b2e6c7..1cf5c014ca 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -110,7 +110,7 @@ $visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $fo
 <?php echo PMA_generate_common_hidden_inputs($url_params); ?>
 <fieldset>
     <legend><?php echo __('Display GIS Visualization'); ?></legend>
-    <div id="placeholder" style="width:<?php echo(htmlspecialchars($visualizationSettings['width'])); ?>px;height:<?php echo(htmlspecialchars($visualizationSettings['height'])); ?>px;">
+    <div id="placeholder" style="width:<?php echo htmlspecialchars($visualizationSettings['width']); ?>px;height:<?php echo htmlspecialchars($visualizationSettings['height']); ?>px;">
         <?php echo $visualization; ?>
     </div>
     <div id="openlayersmap"></div>

From cbbb8b40e1372fe27bda2a15592948e876d68e4b Mon Sep 17 00:00:00 2001
From: Burak Yavuz <hitowerdigit@hotmail.com>
Date: Sun, 31 Mar 2013 19:23:18 +0200
Subject: [PATCH 2/3] Translated using Weblate (Turkish)

Currently translated at 100.0% (2562 of 2562)
---
 po/tr.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index b5da7886a6..3b7b2cdac1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-10-16 14:37+0200\n"
-"PO-Revision-Date: 2013-01-18 19:12+0200\n"
+"PO-Revision-Date: 2013-03-31 19:23+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: Turkish <http://l10n.cihar.com/projects/phpmyadmin/3-5/tr/>\n"
 "Language: tr\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 1.4-dev\n"
+"X-Generator: Weblate 1.5-dev\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353
 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679
@@ -8606,8 +8606,8 @@ msgid ""
 "extended features have been deactivated. To find out why click %shere%s."
 msgstr ""
 "phpMyAdmin yapılandırma depolaması tamamiyle yapılandırılmadı, bazı "
-"genişletilmiş özellikler etkisizleştirildi. Nedenini öğrenmek için %sburaya"
-"%s tıklayın."
+"genişletilmiş özellikler devre dışı bırakıldı. Nedenini öğrenmek için %"
+"sburaya%s tıklayın."
 
 #: main.php:336
 msgid ""

From eaa503cd5d8c4243b1d803eb466366bb67a2ce32 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Tue, 2 Apr 2013 06:32:55 +0530
Subject: [PATCH 3/3] Fix bug #3800 Incorrect keyhandler behaviour #2

---
 ChangeLog                        | 1 +
 libraries/tbl_properties.inc.php | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43abe9e53e..8646cf8535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3705 Attempt to open trigger for edit gives NULL
 - Use HTML5 DOCTYPE 
 - [security] Self-XSS on GIS visualisation page, reported by Janek Vind
+- bug #3800 Incorrect keyhandler behaviour #2
 
 3.5.7.0 (2013-02-15)
 - bug #3779 [core] Problem with backslash in enum fields
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 3fc404240d..ab4a95e3b9 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -365,7 +365,8 @@ for ($i = 0; $i < $num_fields; $i++) {
         $row['DefaultValue'] = PMA_convert_bit_default_value($row['DefaultValue']);
     }
 
-    $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']" class="default_type">';
+    $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '" class="default_type">';
     foreach ($default_options as $key => $value) {
         $content_cells[$i][$ci] .= '<option value="' . $key . '"';
         // is only set when we go back to edit a field's structure
@@ -376,8 +377,8 @@ for ($i = 0; $i < $num_fields; $i++) {
     }
     $content_cells[$i][$ci] .= '</select>';
     $content_cells[$i][$ci] .= '<br />';
-    $content_cells[$i][$ci] .= '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"'
-        . ' type="text" name="field_default_value[' . $i . ']" size="12"'
+    $content_cells[$i][$ci] .= '<input type="text"'
+        . ' name="field_default_value[' . $i . ']" size="12"'
         . ' value="' . (isset($row['DefaultValue']) ? htmlspecialchars($row['DefaultValue']) : '') . '"'
         . ' class="textfield default_value" />';
     $ci++;