diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 83602d7c4a..d458248023 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3052,7 +3052,8 @@ class PMA_DisplayResults ); $transform_options = PMA_Transformation_getOptions( - isset($mime_map[$orgFullColName] + isset( + $mime_map[$orgFullColName] ['transformation_options'] ) ? $mime_map[$orgFullColName] diff --git a/tbl_replace.php b/tbl_replace.php index 00d37a335e..389c1820b1 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -291,11 +291,13 @@ foreach ($loop_array as $rownumber => $where_clause) { } } } // end foreach ($loop_array as $where_clause) -unset($multi_edit_columns_name, $multi_edit_columns_prev, $multi_edit_funcs, +unset( + $multi_edit_columns_name, $multi_edit_columns_prev, $multi_edit_funcs, $multi_edit_columns_type, $multi_edit_columns_null, $func_no_param, $multi_edit_auto_increment, $current_value_as_an_array, $key, $current_value, $loop_array, $where_clause, $using_key, $multi_edit_columns_null_prev, - $insert_fail); + $insert_fail +); // Builds the sql query if ($is_insert && count($value_sets) > 0) { diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php index ba5363fad6..c0ebb018e1 100644 --- a/test/libraries/PMA_mysql_charsets_test.php +++ b/test/libraries/PMA_mysql_charsets_test.php @@ -29,7 +29,8 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * @test * @dataProvider charsetQueryData */ - public function testGenerateCharsetQueryPart($collation, $expected) { + public function testGenerateCharsetQueryPart($collation, $expected) + { $this->assertEquals( $expected, PMA_generateCharsetQueryPart($collation)