Merge and fix conflicts from 3b07b39

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

ChangeLog

@@ -70,6 +70,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

tbl_operations.php

@@ -134,13 +134,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(
         $pma_table,
         $create_options['pack_keys'],
         (empty($create_options['checksum']) ? '0' : '1'),
         ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
         (empty($create_options['delay_key_write']) ? '0' : '1'),
-        $create_options['row_format'],
+        $row_format,
         $new_tbl_storage_engine,
         ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
         $tbl_collation