Merge remote-tracking branch 'origin/master'

2015-05-27 16:30:24 +02:00 · 2015-05-27 16:30:24 +02:00 · 2b17e2be9a
commit 2b17e2be9a
parent 5674bfd79f 3c29b82add
1 changed files with 1 additions and 1 deletions
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/PMA_DisplayResults_test.php
@ -178,7 +178,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
     * @dataProvider providerForTestGetTableNavigation
     */
    public function testGetTableNavigation(
-        $pos_next, $pos_prev, $is_innodb, $output
+        // $pos_next, $pos_prev, $is_innodb, $output
    ) {
        $_SESSION['tmpval']['max_rows'] = '20';
        $_SESSION['tmpval']['pos'] = true;