webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_5_0'

Browse Source
This commit is contained in:
William Desportes
2019-10-18 00:14:04 +02:00
parent 582a013f35 5698fb221f
commit 343adb694f
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
- issue #15499 Fix unparenthesized php deprecation
- issue #15482 Fix URL encoding plus sign (+) in the table or DB name when configuring foreign keys
- issue #14898 Fixed bottom table in list in left panel blocked by horizontal scroll bar
- issue #15161 Fix text area overflows its parent element on "Query" page
4.9.1 (2019-09-20)
- issue #15313 Added support for Twig 2

10
js/database/qbe.js
View File

@@ -27,7 +27,15 @@ AJAX.registerTeardown('database/qbe.js', function () {
});
AJAX.registerOnload('database/qbe.js', function () {
Functions.getSqlEditor($('#textSqlquery'), {}, 'both');
Functions.getSqlEditor($('#textSqlquery'), {}, 'none');
$('#tblQbe').width($('#tblQbe').parent().width());
$('#tblQbeFooters').width($('#tblQbeFooters').parent().width());
$('#tblQbe').resize(function () {
var newWidthTblQbe = $('#textSqlquery').next().width();
$('#tblQbe').width(newWidthTblQbe);
$('#tblQbeFooters').width(newWidthTblQbe);
});
/**
* Ajax handler to check the corresponding 'show' checkbox when column is selected

4
libraries/classes/Database/Qbe.php
View File

@@ -1801,7 +1801,7 @@ class Qbe
$html_output .= Url::getHiddenInputs(['db' => $this->_db]);
// get SQL query
$html_output .= '<div class="floatleft desktop50">';
$html_output .= '<fieldset>';
$html_output .= '<fieldset id="tblQbe">';
$html_output .= '<legend>'
. sprintf(
__('SQL query on database <b>%s</b>:'),
@@ -1821,7 +1821,7 @@ class Qbe
$html_output .= '</textarea>';
$html_output .= '</fieldset>';
// displays form's footers
$html_output .= '<fieldset class="tblFooters">';
$html_output .= '<fieldset class="tblFooters" id="tblQbeFooters">';
$html_output .= '<input type="hidden" name="submit_sql" value="1">';
$html_output .= '<input class="btn btn-primary" type="submit" value="' . __('Submit Query') . '">';
$html_output .= '</fieldset>';