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 2016-06-16 11:40:29 +02:00
commit c5beea64fd
18 changed files with 493 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

986
export.php
View File

File diff suppressed because it is too large Load Diff

4
libraries/Message.php
View File

@ -633,9 +633,7 @@ class Message
if (0 === mb_strlen($message)) {
$string = $this->getString();
if (isset($GLOBALS[$string])) {
$message = $GLOBALS[$string];
} elseif (0 === mb_strlen($string)) {
if (0 === mb_strlen($string)) {
$message = '';
} else {
$message = $string;

20
test/classes/MessageTest.php
View File

@ -453,26 +453,6 @@ class MessageTest extends PMATestCase
$this->assertEquals('', $this->object->getMessage());
}
/**
* getMessage test - with empty message and with string, which is key to GLOBALS
* additional messages are defined
*
* @return void
*/
public function testGetMessageWithoutMessageWithGlobalStringWithAddMessages()
{
$GLOBALS['key'] = 'test message';
$this->object->setMessage('');
$this->object->setString('key');
$this->object->addMessage('test message 2', ' - ');
$this->object->addMessage('test message 3', '&');
$this->assertEquals(
'test message - test message 2&test message 3',
$this->object->getMessage()
);
unset($GLOBALS['key']);
}
/**
* getMessage test - message is defined
* message with BBCode defined

1
test/classes/plugin/export/ExportCodegenTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportCodegen;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportCsvTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportCsv;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportExcelTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportExcel;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportHtmlwordTest.php
View File

@ -11,7 +11,6 @@ require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportJsonTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportJson;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportLatexTest.php
View File

@ -11,7 +11,6 @@ require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportMediawikiTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportMediawiki;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportOdsTest.php
View File

@ -11,7 +11,6 @@ use PMA\libraries\plugins\export\ExportOds;
require_once 'libraries/plugins/export/ExportOds.php';
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'libraries/opendocument.lib.php';
require_once 'test/PMATestCase.php';

1
test/classes/plugin/export/ExportOdtTest.php
View File

@ -13,7 +13,6 @@ require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportPdfTest.php
View File

@ -10,7 +10,6 @@ use PMA\libraries\plugins\export\PMA_ExportPdf;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportPhparrayTest.php
View File

@ -9,7 +9,6 @@ use PMA\libraries\plugins\export\ExportPhparray;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportSqlTest.php
View File

@ -12,7 +12,6 @@ require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportTexytextTest.php
View File

@ -11,7 +11,6 @@ require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportXmlTest.php
View File

@ -12,7 +12,6 @@ $GLOBALS['db'] = 'db';
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportYamlTest.php
View File

@ -10,7 +10,6 @@ use PMA\libraries\plugins\export\ExportYaml;
require_once 'libraries/export.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/database_interface.inc.php';
require_once 'export.php';
require_once 'test/PMATestCase.php';
/**