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 2017-09-09 19:57:59 +02:00
commit 6f1447d84e
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/Config/ServerConfigChecks.php
View File

@ -334,9 +334,9 @@ class ServerConfigChecks
/**
* Check config of servers
*
* @param boolean $cookieAuthUsed Cookie auth is used
* @param boolean $blowfishSecretSet Blowfish secret set
* @param string $blowfishSecret Blowfish secret
* @param boolean $cookieAuthUsed Cookie auth is used
* @param boolean $blowfishSecretSet Blowfish secret set
* @param string $blowfishSecret Blowfish secret
*
* @return array
*/

2
libraries/classes/Plugins/Import/ImportSql.php
View File

@ -174,7 +174,7 @@ class ImportSql extends ImportPlugin
* Handle compatibility options
*
* @param PhpMyAdmin\DatabaseInterface $dbi Database interface
* @param array $request Request array
* @param array $request Request array
*
* @return void
*/

6
libraries/plugin_interface.lib.php
View File

@ -257,18 +257,18 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
/**
* Returns single option in a list element
*
* @param string $section name of
* @param string $section name of config section in $GLOBALS['cfg'][$section] for plugin
* config
* section in
* $GLOBALS['cfg'][$section]
* for plugin
* @param string $plugin_name unique plugin
* @param string $plugin_name unique plugin name
* name
* @param array|\PhpMyAdmin\Properties\PropertyItem &$propertyGroup options
* property main
* group
* instance
* @param boolean $is_subgroup if this group
* @param boolean $is_subgroup if this group is a subgroup
* is a subgroup
*
* @return string table row with option

1
test/classes/config/ServerConfigChecksTest.php
View File

@ -84,7 +84,6 @@ class ServeConfigChecksTest extends PMATestCase
array_keys($_SESSION['messages']['notice'])
);
$this->assertEquals(
array(
'LoginCookieValidity',