diff options
| author | Michal Čihař <michal@cihar.com> | 2017-03-30 14:59:07 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2017-03-30 15:07:42 +0300 |
| commit | 8beb7f544e7895ab80a1a5104945e3def83314ad (patch) | |
| tree | c56b0a78962e00b3499ccc0f1a0b25d28558e94c /setup/lib | |
| parent | 73ab7f380bc2db43a08919247ce1fe418d412d64 (diff) | |
Fixed broken links in setup
Fixes #13133
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'setup/lib')
| -rw-r--r-- | setup/lib/form_processing.lib.php | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 89269db2fe..11db00d061 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -37,21 +37,18 @@ function PMA_Process_formset(FormDisplay $form_display) } // form has errors, show warning - $separator = URL::getArgSeparator('html'); - $page = isset($_GET['page']) ? htmlspecialchars($_GET['page']) : null; - $formset = isset($_GET['formset']) ? htmlspecialchars($_GET['formset']) : null; - $formset = $formset ? "{$separator}formset=$formset" : ''; - $formId = PMA_isValid($_GET['id'], 'numeric') ? $_GET['id'] : null; + $page = isset($_GET['page']) ? $_GET['page'] : ''; + $formset = isset($_GET['formset']) ? $_GET['formset'] : ''; + $formId = PMA_isValid($_GET['id'], 'numeric') ? $_GET['id'] : ''; if ($formId === null && $page == 'servers') { // we've just added a new server, get its id $formId = $form_display->getConfigFile()->getServerCount(); } - $formId = $formId ? "{$separator}id=$formId" : ''; ?> <div class="error"> <h4><?php echo __('Warning') ?></h4> <?php echo __('Submitted form contains errors') ?><br /> - <a href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=revert"> + <a href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert')) ?>"> <?php echo __('Try to revert erroneous fields to their default values') ?> </a> </div> @@ -60,7 +57,7 @@ function PMA_Process_formset(FormDisplay $form_display) <?php echo __('Ignore errors') ?> </a> - <a class="btn" href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=edit"> + <a class="btn" href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit')) ?>"> <?php echo __('Show form') ?> </a> <?php @@ -82,4 +79,4 @@ function PMA_generateHeader303() if (!defined('TESTSUITE')) { exit; } -}
\ No newline at end of file +} |