From 3b07b39c352437bf685b55b9011c565d463b8a34 Mon Sep 17 00:00:00 2001
From: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
Date: Mon, 9 Jan 2017 18:33:14 -0800
Subject: [PATCH 1/2] Fix PHP Notice 'Undefined index: row_format' when
 altering table options. Issue #12840 Signed-off-by: Tim McLaughlin
 <tim.j.mclaughlin@gmail.com>

---
 ChangeLog          | 1 +
 tbl_operations.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1f857d71ea..4b1a95b73f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #12826 Honor user configured connection collation
 - issue #12293 Correctly report OpenSSL errors from cookie encryption
 - issue #12814 DateTime won't allow to input length in Routine editor
+- issue #12840 Fix Notice regarding 'Undefined index: row_format' when altering table options
 - issue #12841 Fixed moving of columns with whitespace in name
 - issue #12847 Fixed editing of virtual columns
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
diff --git a/tbl_operations.php b/tbl_operations.php
index 3c3754d7f4..bbddbaf2ff 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -146,13 +146,17 @@ if (isset($_REQUEST['submitoptions'])) {
         $new_tbl_storage_engine = '';
     }
 
+    $row_format = (isset($create_options['row_format']))
+        ? $create_options['row_format']
+        : $pma_table->getStatusInfo('ROW_FORMAT');
+
     $table_alters = PMA_getTableAltersArray(
         $is_myisam_or_aria, $is_isam, $create_options['pack_keys'],
         (empty($create_options['checksum']) ? '0' : '1'),
         $is_aria,
         ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
         (empty($create_options['delay_key_write']) ? '0' : '1'),
-        $is_innodb, $is_pbxt, $create_options['row_format'],
+        $is_innodb, $is_pbxt, $row_format,
         $new_tbl_storage_engine,
         ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
         $tbl_collation

From 206a59007a085bae7a7c1440a104d2f8a68e2087 Mon Sep 17 00:00:00 2001
From: Flavio Coelho <flavio.coelho.mail@gmail.com>
Date: Thu, 19 Jan 2017 21:38:39 +0000
Subject: [PATCH 2/2] Translated using Weblate (Portuguese)

Currently translated at 54.0% (1740 of 3222 strings)

[CI skip]
---
 po/pt.po | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 8992f878a2..7ae5dff7de 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2017-01-16 01:58+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
+"PO-Revision-Date: 2017-01-19 21:38+0000\n"
+"Last-Translator: Flavio Coelho <flavio.coelho.mail@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-6/pt/>\n"
 "Language: pt\n"
@@ -1209,8 +1209,6 @@ msgid "Used memory"
 msgstr "Memória utilizada"
 
 #: js/messages.php:186
-#, fuzzy
-#| msgid "Total Swap"
 msgid "Total swap"
 msgstr "Swap total"
 
@@ -1730,8 +1728,6 @@ msgid "Processing request"
 msgstr "Processando Pedido"
 
 #: js/messages.php:355
-#, fuzzy
-#| msgid "Request Aborted!!"
 msgid "Request failed!!"
 msgstr "Pedido falhou!!"