Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-03 22:05:22 +02:00
commit 3d84c3d170
3 changed files with 2 additions and 2 deletions

View File

@ -97,7 +97,6 @@ class PMA_Scripts
/**
* Generates new PMA_Scripts objects
*
* @return PMA_Scripts object
*/
public function __construct()
{

View File

@ -31,7 +31,6 @@ class SystemDatabase
*
* @param \PMA_DatabaseInterface $dbi Database interface for the system database
*
* @return SystemDatabase
*/
function __construct(\PMA_DatabaseInterface $dbi)
{

View File

@ -337,6 +337,7 @@ class PMA_ExportPdf extends PMA_PDF
$row = 0;
$tmpheight = array();
$maxpage = $this->page;
$data = array();
$triggers = $GLOBALS['dbi']->getTriggers($db, $table);
@ -541,6 +542,7 @@ class PMA_ExportPdf extends PMA_PDF
$row = 0;
$tmpheight = array();
$maxpage = $this->page;
$data = array();
// fun begin
foreach ($columns as $column) {