From 602cf50e52c567d34728c358715a41a52444187e Mon Sep 17 00:00:00 2001
From: Sergi L <sergi_linares@outlook.com>
Date: Thu, 17 Oct 2019 23:18:22 +0200
Subject: [PATCH 1/2] Text-area-overflows-parent-element

Signed-off-by: Sergi Linares <sergi_linares@outlook.com>
---
 js/db_qbe.js                       | 10 +++++++++-
 libraries/classes/Database/Qbe.php |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/js/db_qbe.js b/js/db_qbe.js
index f2b9307c39..7c5f50ac3c 100644
--- a/js/db_qbe.js
+++ b/js/db_qbe.js
@@ -28,7 +28,15 @@ AJAX.registerTeardown('db_qbe.js', function () {
 });
 
 AJAX.registerOnload('db_qbe.js', function () {
-    PMA_getSQLEditor($('#textSqlquery'), {}, 'both');
+    PMA_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
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
index 35785b98b4..fac18fe0b4 100644
--- a/libraries/classes/Database/Qbe.php
+++ b/libraries/classes/Database/Qbe.php
@@ -1817,7 +1817,7 @@ class Qbe
         $html_output .= Url::getHiddenInputs(array('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>:'),
@@ -1837,7 +1837,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 type="submit" value="' . __('Submit Query') . '" />';
         $html_output .= '</fieldset>';

From 22b04255ebcaf1a79adebb4076c5988054b398c5 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 17 Oct 2019 23:56:52 +0200
Subject: [PATCH 2/2] Add ChangeLog entry for #15161

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 16b385f6a4..e53f653910 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,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