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-12-13 16:32:46 +01:00
commit d379d7f568
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/config/PageSettings.php
View File

@ -102,6 +102,8 @@ class PageSettings
* @param FormDisplay &$form_display Form
* @param ConfigFile &$cf Configuration file
* @param Message|null &$error Error message
* @param FormDisplay $form_display
* @param ConfigFile $cf
*
* @return void
*/

1
libraries/controllers/table/TableStructureController.php
View File

@ -17,7 +17,6 @@ use PMA\libraries\Util;
use PMA\Util as Util_lib;
use SqlParser;
use SqlParser\Statements\CreateStatement;
use SqlParser\Utils\Table as SqlTable;
use PMA\libraries\Table;
use PMA\libraries\controllers\TableController;
use PMA\libraries\URL;

8
libraries/export.lib.php
View File

@ -248,7 +248,7 @@ function PMA_getMemoryLimitForExport()
* @param string $compression compression asked
* @param string $filename_template the filename template
*
* @return array the filename template and mime type
* @return string[] the filename template and mime type
*/
function PMA_getExportFilenameAndMimetype(
$export_type, $remember_template, $export_plugin, $compression,
@ -366,7 +366,7 @@ function PMA_openExportFile($filename, $quick_export)
* @param string $dump_buffer the current dump buffer
* @param string $save_filename the export filename
*
* @return object $message a message object (or empty string)
* @return Message $message a message object (or empty string)
*/
function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
{
@ -465,7 +465,7 @@ function PMA_saveObjectInBuffer($object_name, $append = false)
* @param string $db the database name
* @param string $table the table name
*
* @return array the generated HTML and back button
* @return string[] the generated HTML and back button
*/
function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
{
@ -1021,7 +1021,7 @@ function PMA_unlockTables()
/**
* Returns all the metadata types that can be exported with a database or a table
*
* @return array metadata types.
* @return string[] metadata types.
*/
function PMA_getMetadataTypesToExport()
{

2
libraries/gis/GISPoint.php
View File

@ -75,7 +75,7 @@ class GISPoint extends GISGeometry
* @param array $scale_data Array containing data related to scaling
* @param resource $image Image object
*
* @return object the modified image object
* @return resource the modified image object
* @access public
*/
public function prepareRowAsPng(