diff options
-rw-r--r-- | setup/frames/form.inc.php | 2 | ||||
-rw-r--r-- | setup/frames/servers.inc.php | 2 | ||||
-rw-r--r-- | setup/lib/form_processing.lib.php | 8 | ||||
-rw-r--r-- | test/libraries/PMA_Form_Processing_test.php | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index c747e06ef3..ac9d00b395 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -32,5 +32,5 @@ $form_display = new FormDisplay($GLOBALS['ConfigFile']); foreach ($forms[$formset_id] as $form_name => $form) { $form_display->registerForm($form_name, $form); } -process_formset($form_display); +PMA_process_formset($form_display); ?> diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php index 10c02ac9cd..133f87a0a3 100644 --- a/setup/frames/servers.inc.php +++ b/setup/frames/servers.inc.php @@ -46,5 +46,5 @@ $form_display = new FormDisplay($cf); foreach ($forms['Servers'] as $form_name => $form) { $form_display->registerForm($form_name, $form, $id); } -process_formset($form_display); +PMA_process_formset($form_display); ?> diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 6a7aed37a1..8b9e825722 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -13,12 +13,12 @@ * * @return void */ -function process_formset(FormDisplay $form_display) +function PMA_process_formset(FormDisplay $form_display) { if (filter_input(INPUT_GET, 'mode') == 'revert') { // revert erroneous fields to their default values $form_display->fixErrors(); - generateHeader303(); + PMA_generateHeader303(); } if (!$form_display->process(false)) { @@ -29,7 +29,7 @@ function process_formset(FormDisplay $form_display) // check for form errors if (!$form_display->hasErrors()) { - generateHeader303(); + PMA_generateHeader303(); return; } @@ -66,7 +66,7 @@ function process_formset(FormDisplay $form_display) * * @return void */ -function generateHeader303() +function PMA_generateHeader303() { // drop post data header('HTTP/1.1 303 See Other'); diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php index 2a2eaadb5a..0b6f608603 100644 --- a/test/libraries/PMA_Form_Processing_test.php +++ b/test/libraries/PMA_Form_Processing_test.php @@ -50,7 +50,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase ->method('display') ->with(true, true); - process_formset($formDisplay); + PMA_process_formset($formDisplay); // case 2 $formDisplay = $this->getMockBuilder('FormDisplay') @@ -69,7 +69,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase ->will($this->returnValue(true)); ob_start(); - process_formset($formDisplay); + PMA_process_formset($formDisplay); $result = ob_get_clean(); $this->assertContains( @@ -108,7 +108,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase ->with() ->will($this->returnValue(false)); - process_formset($formDisplay); + PMA_process_formset($formDisplay); $this->assertEquals( array('HTTP/1.1 303 See Other', 'Location: index.php'), |