Merge remote-tracking branch 'origin/master'

2016-01-06 11:41:15 +01:00 · 2016-01-06 11:41:15 +01:00 · 927c3e9cc9
commit 927c3e9cc9
parent 1242b603d7 047aeca312
1 changed files with 1 additions and 1 deletions
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@ -78,7 +78,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase

        $_REQUEST['db_collation'] = 'db1';
        $this->assertRegExp(
-            '/.*db_operations.php(.|[\n])*db_rename([\n]|.)*Rename database to.*/m',
+            '/.*db_operations.php(.|[\\n])*db_rename([\\n]|.)*Rename database to.*/m',
            PMA_getHtmlForRenameDatabase("pma")
        );
    }