webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

Fix codestyle

Browse Source
This commit is contained in:
Marc Delisle
2013-09-09 05:55:04 -04:00
parent 2c41695fe9
commit 24e84b07df
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/frames/config.inc.php
View File

@@ -20,7 +20,7 @@ require_once './setup/lib/ConfigGenerator.class.php';
$config_readable = false;
$config_writable = false;
$config_exists = false;
check_config_rw($config_readable, $config_writable, $config_exists);
PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
echo '<h2>' . __('Configuration file') . '</h2>';
PMA_displayFormTop('config.php');

2
setup/frames/index.inc.php
View File

@@ -45,7 +45,7 @@ perform_config_checks();
$config_readable = false;
$config_writable = false;
$config_exists = false;
check_config_rw($config_readable, $config_writable, $config_exists);
PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
if (!$config_writable || !$config_readable) {
PMA_messagesSet(
'error', 'config_rw', __('Cannot load or save configuration'),

2
setup/lib/index.lib.php
View File

@@ -182,7 +182,7 @@ function PMA_versionCheck()
*
* @return void
*/
function check_config_rw(&$is_readable, &$is_writable, &$file_exists)
function PMA_checkConfigRw(&$is_readable, &$is_writable, &$file_exists)
{
$file_path = ConfigFile::getInstance()->getFilePath();
$file_dir = dirname($file_path);

8
test/libraries/PMA_Index_test.php
View File

@@ -306,11 +306,11 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for check_config_rw
* Test for PMA_checkConfigRw
*
* @return void
*/
public function testCheckConfigRW()
public function testPMACheckConfigRw()
{
if (! PMA_HAS_RUNKIT) {
$this->markTestSkipped('Cannot redefine constant');
@@ -331,7 +331,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
$is_writable = false;
$file_exists = false;
check_config_rw($is_readable, $is_writable, $file_exists);
PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
$this->assertTrue(
$is_readable
@@ -350,7 +350,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
'test/test_data/test.file'
);
check_config_rw($is_readable, $is_writable, $file_exists);
PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
$this->assertTrue(
$is_readable