gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-02-24 12:00:17 +01:00
commit d21b491087
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/classes/plugin/export/PMA_ExportOds_test.php
View File

@ -192,7 +192,8 @@ class PMA_ExportOds_Test extends PHPUnit_Framework_TestCase
{
$GLOBALS['ods_buffer'] = 'header';
$this->expectOutputRegex('/^PK.*content.xml/');
$this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c2f/');
$this->setOutputCallback('bin2hex');
$this->assertTrue(
$this->object->exportFooter()

3
test/classes/plugin/export/PMA_ExportOdt_test.php
View File

@ -333,7 +333,8 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
{
$GLOBALS['odt_buffer'] = 'header';
$this->expectOutputRegex('/^PK.*content.xml/');
$this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c2f/');
$this->setOutputCallback('bin2hex');
$this->assertTrue(
$this->object->exportFooter()