diff options
-rw-r--r-- | setup/lib/form_processing.lib.php | 15 | ||||
-rw-r--r-- | test/libraries/PMA_Form_Processing_test.php | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index db80e44ec5..d8eadf6610 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -48,19 +48,18 @@ function PMA_Process_formset(FormDisplay $form_display) <div class="error"> <h4><?php echo __('Warning') ?></h4> <?php echo __('Submitted form contains errors') ?><br /> - <a href="<?php echo PMA_URL_getCommon() . $separator ?> - page=<?php echo $page . $formset . $formId . $separator ?>mode=revert"> - <?php echo __('Try to revert erroneous fields to their default values') - ?> + <a href="<?php echo PMA_URL_getCommon() . $separator ?>page=<?php echo $page . $formset . $formId . $separator ?>mode=revert"> + <?php echo __('Try to revert erroneous fields to their default values') ?> </a> </div> <?php $form_display->displayErrors() ?> <a class="btn" href="index.php<?php echo PMA_URL_getCommon() ?>"> - <?php echo __('Ignore errors') ?></a> + <?php echo __('Ignore errors') ?> + </a> - <a class="btn" href="<?php echo PMA_URL_getCommon() . $separator ?> - page=<?php echo $page . $formset . $formId - . $separator ?>mode=edit"><?php echo __('Show form') ?></a> + <a class="btn" href="<?php echo PMA_URL_getCommon() . $separator ?>page=<?php echo $page . $formset . $formId . $separator ?>mode=edit"> + <?php echo __('Show form') ?> + </a> <?php } diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php index 59af91e3bb..6448c3a108 100644 --- a/test/libraries/PMA_Form_Processing_test.php +++ b/test/libraries/PMA_Form_Processing_test.php @@ -78,17 +78,17 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - '<a href="?page=&mode=revert">', + '<a href="?lang=en&token=token&page=&mode=revert">', $result ); $this->assertContains( - '<a class="btn" href="index.php">', + '<a class="btn" href="index.php?lang=en&token=token">', $result ); $this->assertContains( - '<a class="btn" href="?page=&mode=edit">', + '<a class="btn" href="?lang=en&token=token&page=&mode=edit">', $result ); |