gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-03-30 14:09:19 +02:00
commit 769f9ab88f
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
4.7.1 (not yet released)
- issue #13132 Always execute tracking queries as controluser
- issue #13125 Focus on SQL editor after inserting field name
- issue #13133 Fixed broken links in setup
4.7.0 (2017-03-28)
- patch #12233 [Display] Improve message when renaming database to same name

1
doc/config.rst
View File

@ -3219,6 +3219,7 @@ Developer
* There is welcome message on the main page.
* There is footer information about demo server and used git revision.
* The setup script is enabled even with existing configuration.
* The setup does not try to connect to the MySQL server.
.. _config-examples:

5
libraries/config/Validator.php
View File

@ -179,6 +179,11 @@ class Validator
$pass = null,
$error_key = 'Server'
) {
if ($GLOBALS['cfg']['DBG']['demo']) {
// Connection test disabled on the demo server!
return true;
}
// static::testPHPErrorMsg();
$error = null;
$host = PMA_sanitizeMySQLHost($host);

2
setup/config.php
View File

@ -46,6 +46,6 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
//
// Show generated config file in a <textarea>
//
$response->generateHeader303('index.php' . URL::getCommonRaw() . '&page=config');
$response->generateHeader303('index.php' . URL::getCommonRaw(array('page' => 'config')));
exit;
}

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

@ -28,7 +28,6 @@ $all_languages = LanguageManager::getInstance()->sortedLanguages();
/** @var ConfigFile $cf */
$cf = $GLOBALS['ConfigFile'];
$separator = URL::getArgSeparator('html');
// message handling
PMA_messagesBegin();
@ -157,12 +156,10 @@ if ($cf->getServerCount() > 0) {
echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
echo '<td style="white-space: nowrap">';
echo '<small>';
echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
, $separator , 'mode=edit' , $separator , 'id=' , $id , '">'
echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $id)), '">'
, __('Edit') , '</a>';
echo ' | ';
echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
, $separator , 'mode=remove' , $separator , 'id=' , $id , '">'
echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'remove', 'id' => $id)), '">'
, __('Delete') , '</a>';
echo '</small>';
echo '</td>';
@ -270,6 +267,6 @@ echo '<div id="footer">';
echo '<a href="../url.php?url=https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
echo '<a href="../url.php?url=https://www.phpmyadmin.net/donate/">'
, __('Donate') , '</a>';
echo '<a href="' , URL::getCommon() , $separator , 'version_check=1">'
echo '<a href="' , URL::getCommon(array('version_check' => '1')), '">'
, __('Check for latest version') , '</a>';
echo '</div>';

15
setup/lib/form_processing.lib.php
View File

@ -39,21 +39,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>
@ -62,8 +59,8 @@ function PMA_Process_formset(FormDisplay $form_display)
<?php echo __('Ignore errors') ?>
</a>
&nbsp;
<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
}
}