diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-06-30 12:46:42 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-06-30 12:46:42 +0300 |
| commit | dadecaf393a7814e49ca0b50dc16b90a08c0fc1d (patch) | |
| tree | 3ccbc45568267373fc588614f34c13b31b144dad /test | |
| parent | 653acc8444c9a37b91fda8940f5fa2a94586e42e (diff) | |
Match the name of corresponding config value.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/classes/plugin/export/PMA_ExportHtmlword_test.php | 2 | ||||
| -rw-r--r-- | test/classes/plugin/export/PMA_ExportSql_test.php | 4 | ||||
| -rw-r--r-- | test/classes/plugin/export/PMA_ExportXml_test.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php index aad24098ca..1dfc41cd13 100644 --- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php +++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php @@ -244,7 +244,7 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase // case 2 - $GLOBALS['charset_of_file'] = 'ISO-8859-1'; + $GLOBALS['charset'] = 'ISO-8859-1'; ob_start(); $this->object->exportHeader(); $result = ob_get_clean(); diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 08ed6e01f6..7d18c2ba6d 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -633,7 +633,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['sql_disable_fk'] = true; $GLOBALS['sql_use_transaction'] = true; - $GLOBALS['charset_of_file'] = 'utf-8'; + $GLOBALS['charset'] = 'utf-8'; $GLOBALS['mysql_charset_map']['utf-8'] = true; $GLOBALS['sql_utc_time'] = true; $GLOBALS['old_tz'] = 'GMT'; @@ -704,7 +704,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['sql_header_comment'] = "h1C\nh2C"; $GLOBALS['sql_use_transaction'] = true; $GLOBALS['sql_include_comments'] = true; - $GLOBALS['charset_of_file'] = 'utf-8'; + $GLOBALS['charset'] = 'utf-8'; $GLOBALS['mysql_charset_map']['utf-8'] = true; $dbi = $this->getMockBuilder('PMA_DatabaseInterface') diff --git a/test/classes/plugin/export/PMA_ExportXml_test.php b/test/classes/plugin/export/PMA_ExportXml_test.php index be041d946d..bc1f6dc237 100644 --- a/test/classes/plugin/export/PMA_ExportXml_test.php +++ b/test/classes/plugin/export/PMA_ExportXml_test.php @@ -246,7 +246,7 @@ class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase $GLOBALS['xml_export_functions'] = 1; $GLOBALS['xml_export_contents'] = 1; $GLOBALS['output_charset_conversion'] = 1; - $GLOBALS['charset_of_file'] = 'iso-8859-1'; + $GLOBALS['charset'] = 'iso-8859-1'; $GLOBALS['cfg']['Server']['port'] = 80; $GLOBALS['cfg']['Server']['host'] = 'localhost'; $GLOBALS['cfg']['Server']['DisableIS'] = false; |