Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Formset processing library
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -41,13 +40,13 @@ function process_formset(FormDisplay $form_display) {
|
||||
?>
|
||||
<div class="warning">
|
||||
<h4><?php echo __('Warning') ?></h4>
|
||||
<?php echo PMA_lang('error_form') ?><br />
|
||||
<a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
|
||||
<?php echo __('Submitted form contains errors') ?><br />
|
||||
<a href="?page=<?php echo $page . $formset . $id . $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_lang('IgnoreErrors') ?></a>
|
||||
<a class="btn" href="index.php"><?php echo __('Ignore errors') ?></a>
|
||||
|
||||
<a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
|
||||
<a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo __('Show form') ?></a>
|
||||
<?php
|
||||
} else {
|
||||
// drop post data
|
||||
|
Reference in New Issue
Block a user