Merge branch 'QA_4_4'

2015-03-06 16:04:12 +05:30 · 2015-03-06 16:04:12 +05:30 · 87fc15cc00
commit 87fc15cc00
parent faa85419c5 c93d7f8440
1 changed files with 2 additions and 1 deletions
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@ -352,7 +352,8 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
            'col_length'=>12,
            'col_collation'=>'utf8_general_ci',
            'col_isNull'=>1,
-            'col_extra'=>array('col_extra'=>'','col_attribute'=>'')
+            'col_extra'=> '',
+            'col_attribute'=>''
        );
        $result = PMA_getHTMLforCentralColumnsTableRow($row, false, 1, 'phpmyadmin');
        $this->assertTag(