From d3899dda2d06a06a2259f8fa644a7ac8071d75b8 Mon Sep 17 00:00:00 2001
From: Cristiano Lancelotti <lancelot.info@gmail.com>
Date: Sat, 17 Dec 2016 03:42:29 -0200
Subject: [PATCH 01/63] Remove inline styles from elements with
 id='serverstatusquerieschart_data'(partial fix of issue #12262)

Signed-off-by: Cristiano Lancelotti <lancelot.info@gmail.com>
---
 libraries/server_status_queries.lib.php | 2 +-
 themes/original/css/common.css.php      | 4 ++++
 themes/pmahomme/css/common.css.php      | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index 2bbbaafe15..698206b1df 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -135,7 +135,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
     $retval .= '</table>';
 
     $retval .= '<div id="serverstatusquerieschart"></div>';
-    $retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
+    $retval .= '<div id="serverstatusquerieschart_data">';
     if ($other_sum > 0) {
         $chart_json[__('Other')] = $other_sum;
     }
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 21cc80c2e8..c477e71d97 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -1642,6 +1642,10 @@ input#input_import_file {
     vertical-align: baseline;
 }
 
+#serverstatusquerieschart_data {
+    display: none;
+}
+
 #popup_background {
     display: none;
     position: fixed;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 6bde034311..2d3dd644c0 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2140,6 +2140,10 @@ input#input_import_file {
     vertical-align: baseline;
 }
 
+#serverstatusquerieschart_data {
+    display: none;
+}
+
 #popup_background {
     display: none;
     position: fixed;

From 3330e4a64560bc6061b1cc6236a469f758db5acf Mon Sep 17 00:00:00 2001
From: Critiano Lancelotti <lancelot.info@gmail.com>
Date: Thu, 22 Dec 2016 04:40:54 -0200
Subject: [PATCH 02/63] Remove unnecessary div and move data attibute to
 serverstatusquerieschart

Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
---
 libraries/server_status_queries.lib.php | 3 +--
 themes/original/css/common.css.php      | 5 +----
 themes/pmahomme/css/common.css.php      | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index 698206b1df..c9fe123d73 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -134,8 +134,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
     $retval .= '</tbody>';
     $retval .= '</table>';
 
-    $retval .= '<div id="serverstatusquerieschart"></div>';
-    $retval .= '<div id="serverstatusquerieschart_data">';
+    $retval .= '<div id="serverstatusquerieschart">';
     if ($other_sum > 0) {
         $chart_json[__('Other')] = $other_sum;
     }
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index c477e71d97..e69be70b73 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -978,6 +978,7 @@ div#serverstatusquerieschart {
     width:500px;
     height:350px;
     padding-<?php echo $left; ?>: 30px;
+    display: none;
 }
 
 div#serverstatus table#serverstatusqueriesdetails {
@@ -1642,10 +1643,6 @@ input#input_import_file {
     vertical-align: baseline;
 }
 
-#serverstatusquerieschart_data {
-    display: none;
-}
-
 #popup_background {
     display: none;
     position: fixed;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 2d3dd644c0..4d5f9ab485 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1297,6 +1297,7 @@ div#serverstatusquerieschart {
     width: 500px;
     height: 350px;
     padding-<?php echo $left; ?>: 30px;
+    display: none;
 }
 
 table#serverstatusqueriesdetails,
@@ -2140,10 +2141,6 @@ input#input_import_file {
     vertical-align: baseline;
 }
 
-#serverstatusquerieschart_data {
-    display: none;
-}
-
 #popup_background {
     display: none;
     position: fixed;

From 059a43b10181035c68ddc231cbb20fd119576cc3 Mon Sep 17 00:00:00 2001
From: Critiano Lancelotti <lancelot.info@gmail.com>
Date: Sat, 24 Dec 2016 04:10:22 -0200
Subject: [PATCH 03/63] Adjust the test to new output

Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
---
 test/libraries/PMA_server_status_queries_test.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index af23c3bfc3..50406c2799 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -219,12 +219,9 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
 
         //validate 3:serverstatusquerieschart
         $this->assertContains(
-            '<div id="serverstatusquerieschart"></div>',
-            $html
-        );
-        $this->assertContains(
-            '<div id="serverstatusquerieschart_data"',
+            '<div id="serverstatusquerieschart">',
             $html
         );
+
     }
 }

From 93e354c2e33347a138234d236b2e987a7f092b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 7 Jan 2017 14:22:14 +0100
Subject: [PATCH 04/63] Revert "Remove option to show phpinfo()
 ($cfg['ShowPhpInfo'])"

This reverts commit e67e69229a1df3a26df12b1bae89065834fd85b4.
---
 doc/config.rst                    | 14 +++++++++++++-
 index.php                         | 11 ++++++++++-
 libraries/common.inc.php          |  1 +
 libraries/config.default.php      |  7 +++++++
 libraries/config/messages.inc.php |  5 +++++
 libraries/config/setup.forms.php  |  1 +
 phpinfo.php                       | 22 ++++++++++++++++++++++
 7 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 phpinfo.php

diff --git a/doc/config.rst b/doc/config.rst
index dc464797e1..b167a05695 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1850,6 +1850,11 @@ Main panel
     You can additionally hide more information by using
     :config:option:`$cfg['Servers'][$i]['verbose']`.
 
+.. config:option:: $cfg['ShowPhpInfo']
+
+    :type: boolean
+    :default: false
+
 .. config:option:: $cfg['ShowChgPassword']
 
     :type: boolean
@@ -1860,11 +1865,18 @@ Main panel
     :type: boolean
     :default: true
 
-    Defines whether to display the 
+    Defines whether to display the :guilabel:`PHP information` and
     :guilabel:`Change password` links and form for creating database or not at
     the starting main (right) frame. This setting does not check MySQL commands
     entered directly.
 
+    Please note that to block the usage of ``phpinfo()`` in scripts, you have to
+    put this in your :file:`php.ini`:
+
+    .. code-block:: ini
+
+        disable_functions = phpinfo()
+
     Also note that enabling the :guilabel:`Change password` link has no effect
     with config authentication mode: because of the hard coded password value
     in the configuration file, end users can't be allowed to change their
diff --git a/index.php b/index.php
index 7643c68407..c7fc9d1225 100644
--- a/index.php
+++ b/index.php
@@ -317,7 +317,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
        . ' </div>';
 }
 
-if ($GLOBALS['cfg']['ShowServerInfo']) {
+if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
     echo '<div class="group">';
     echo '<h2>' , __('Web server') , '</h2>';
     echo '<ul>';
@@ -357,6 +357,15 @@ if ($GLOBALS['cfg']['ShowServerInfo']) {
         }
     }
 
+    if ($cfg['ShowPhpInfo']) {
+        PMA_printListItem(
+            __('Show PHP information'),
+            'li_phpinfo',
+            'phpinfo.php' . $common_url_query,
+            null,
+            '_blank'
+        );
+    }
     echo '  </ul>';
     echo ' </div>';
 }
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8a2cbbf8de..bcdb8b573f 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -316,6 +316,7 @@ $goto_whitelist = array(
     'index.php',
     'pdf_pages.php',
     'pdf_schema.php',
+    //'phpinfo.php',
     'server_binlog.php',
     'server_collations.php',
     'server_databases.php',
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9d91c999c8..ea91e0ab0d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1057,6 +1057,13 @@ $cfg['NavigationTreeShowEvents'] = true;
  */
 $cfg['ShowStats'] = true;
 
+/**
+ * show PHP info link
+ *
+ * @global boolean $cfg['ShowPhpInfo']
+ */
+$cfg['ShowPhpInfo'] = false;
+
 /**
  * show MySQL server and web server information
  *
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 418bfdd66d..49a23e9b03 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -865,6 +865,11 @@ $strConfigShowFunctionFields_desc = __(
 $strConfigShowFunctionFields_name = __('Show function fields');
 $strConfigShowHint_desc = __('Whether to show hint or not.');
 $strConfigShowHint_name = __('Show hint');
+$strConfigShowPhpInfo_desc = __(
+    'Shows link to [a@https://php.net/manual/function.phpinfo.php]phpinfo()[/a] ' .
+    'output.'
+);
+$strConfigShowPhpInfo_name = __('Show phpinfo() link');
 $strConfigShowServerInfo_name = __('Show detailed MySQL server information');
 $strConfigShowSQL_desc = __(
     'Defines whether SQL queries generated by phpMyAdmin should be displayed.'
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index c8743d4e1c..cfffe9d5d1 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -203,6 +203,7 @@ $forms['Main_panel']['Startup'] = array(
     'ShowCreateDb',
     'ShowStats',
     'ShowServerInfo',
+    'ShowPhpInfo',
     'ShowChgPassword');
 $forms['Main_panel']['DbStructure'] = array(
     'ShowDbStructureComment',
diff --git a/phpinfo.php b/phpinfo.php
new file mode 100644
index 0000000000..6ac84c7ea4
--- /dev/null
+++ b/phpinfo.php
@@ -0,0 +1,22 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * phpinfo() wrapper to allow displaying only when configured to do so.
+ *
+ * @package PhpMyAdmin
+ */
+
+/**
+ * Gets core libraries and defines some variables
+ */
+require_once 'libraries/common.inc.php';
+$response = PMA\libraries\Response::getInstance();
+$response->disable();
+$response->getHeader()->sendHttpHeaders();
+
+/**
+ * Displays PHP information
+ */
+if ($GLOBALS['cfg']['ShowPhpInfo']) {
+    phpinfo();
+}

From 1089a7d67e39f9017ae96c92b922f89648dff240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 7 Jan 2017 14:23:28 +0100
Subject: [PATCH 05/63] Limit what we display in phpinfo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- general information
- configuration
- modules

This way we avoid displaying sensitive things (such as httpOnly cookies
from environment of variables).

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 phpinfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpinfo.php b/phpinfo.php
index 6ac84c7ea4..0daa5f9f65 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -18,5 +18,5 @@ $response->getHeader()->sendHttpHeaders();
  * Displays PHP information
  */
 if ($GLOBALS['cfg']['ShowPhpInfo']) {
-    phpinfo();
+    phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
 }

From fdbef2dcc8e027155e3e5f3af8e460482830c9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 7 Jan 2017 14:30:37 +0100
Subject: [PATCH 06/63] Add warning about enabling phpinfo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 doc/config.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/config.rst b/doc/config.rst
index b167a05695..8aeb0560b7 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1877,6 +1877,14 @@ Main panel
 
         disable_functions = phpinfo()
 
+    .. warning::
+
+        Enabling phpinfo page will leak quite a lot of information about server
+        setup. Is it not recommended to enable this on shared installations.
+
+        This might also make easier some remote attacks on your installations,
+        so enable this only when needed.
+
     Also note that enabling the :guilabel:`Change password` link has no effect
     with config authentication mode: because of the hard coded password value
     in the configuration file, end users can't be allowed to change their

From 4abbe78a071d46283c5db485f38d8db691322e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 7 Jan 2017 16:09:57 +0100
Subject: [PATCH 07/63] Remove unused entries from goto whitelist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/common.inc.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index bcdb8b573f..9326b1f936 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -294,9 +294,6 @@ $GLOBALS['url_params'] = array();
  * @global array $goto_whitelist
  */
 $goto_whitelist = array(
-    //'browse_foreigners.php',
-    //'changelog.php',
-    //'chk_rel.php',
     'db_datadict.php',
     'db_sql.php',
     'db_events.php',
@@ -310,13 +307,9 @@ $goto_whitelist = array(
     'db_routines.php',
     'export.php',
     'import.php',
-    //'index.php',
-    //'navigation.php',
-    //'license.php',
     'index.php',
     'pdf_pages.php',
     'pdf_schema.php',
-    //'phpinfo.php',
     'server_binlog.php',
     'server_collations.php',
     'server_databases.php',
@@ -346,7 +339,6 @@ $goto_whitelist = array(
     'tbl_row_action.php',
     'tbl_select.php',
     'tbl_zoom_select.php',
-    //'themes.php',
     'transformation_overview.php',
     'transformation_wrapper.php',
     'user_password.php',

From 0972666fb28706a64a50ed40acc717135f838c43 Mon Sep 17 00:00:00 2001
From: Critiano Lancelotti <lancelot.info@gmail.com>
Date: Sun, 8 Jan 2017 05:19:18 -0200
Subject: [PATCH 08/63] Fix the problem of chart is not rendered

Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
---
 js/server_status_queries.js        | 3 ++-
 themes/original/css/common.css.php | 1 -
 themes/pmahomme/css/common.css.php | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index a4a4e005e0..e5a31cc9d6 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,9 +16,10 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(jQuery.parseJSON($('#serverstatusquerieschart_data').text()), function (key, value) {
+        $.each(jQuery.parseJSON($('#serverstatusquerieschart').text()), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
+        $('#serverstatusquerieschart').empty();
         $('#serverstatusquerieschart').data(
             'queryPieChart',
             PMA_createProfilingChart(
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index e69be70b73..21cc80c2e8 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -978,7 +978,6 @@ div#serverstatusquerieschart {
     width:500px;
     height:350px;
     padding-<?php echo $left; ?>: 30px;
-    display: none;
 }
 
 div#serverstatus table#serverstatusqueriesdetails {
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 4d5f9ab485..6bde034311 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1297,7 +1297,6 @@ div#serverstatusquerieschart {
     width: 500px;
     height: 350px;
     padding-<?php echo $left; ?>: 30px;
-    display: none;
 }
 
 table#serverstatusqueriesdetails,

From 2c11b650ec5ed5316b8a34dd9f226d8abe49f2c3 Mon Sep 17 00:00:00 2001
From: Critiano Lancelotti <lancelot.info@gmail.com>
Date: Sun, 8 Jan 2017 08:30:59 -0200
Subject: [PATCH 09/63] Exchange jQuery.parseJSON() for JSON.parse()

---
 js/server_status_queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index e5a31cc9d6..7280896a0d 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,7 +16,7 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(jQuery.parseJSON($('#serverstatusquerieschart').text()), function (key, value) {
+        $.each(JSON.parse($('#serverstatusquerieschart').text()), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
         $('#serverstatusquerieschart').empty();

From 528d702e6bdbeeb4d6d2fe4de7fe277d646593e2 Mon Sep 17 00:00:00 2001
From: osaid <osaid.nasir@gmail.com>
Date: Sun, 8 Jan 2017 19:04:03 +0530
Subject: [PATCH 10/63] use shared response mock

Signed-off-by: osaid <osaid.nasir@gmail.com>
---
 .../plugin/auth/AuthenticationSignonTest.php  | 64 ++-----------------
 test/libraries/PMA_Form_Processing_test.php   | 26 ++------
 test/libraries/PMA_user_preferences_test.php  | 22 +------
 3 files changed, 10 insertions(+), 102 deletions(-)

diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php
index ea0cea4305..2b18eea2af 100644
--- a/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ b/test/classes/plugin/auth/AuthenticationSignonTest.php
@@ -40,6 +40,7 @@ class AuthenticationSignonTest extends PMATestCase
      */
     public function tearDown()
     {
+    	parent::tearDown();
         unset($this->object);
     }
 
@@ -69,31 +70,12 @@ class AuthenticationSignonTest extends PMATestCase
      */
     public function testAuthLogoutURL()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
+        $this->mockResponse('Location: https://example.com/logoutURL');
 
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/logoutURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logoutURL';
 
         $this->object->logOut();
-
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**
@@ -103,32 +85,13 @@ class AuthenticationSignonTest extends PMATestCase
      */
     public function testAuthLogout()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
+        $this->mockResponse('Location: https://example.com/SignonURL');
 
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/SignonURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
         $GLOBALS['header'] = array();
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['LogoutURL'] = '';
 
         $this->object->logOut();
-
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**
@@ -189,25 +152,7 @@ class AuthenticationSignonTest extends PMATestCase
      */
     public function testAuthCheckToken()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/SignonURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
+        $this->mockResponse('Location: https://example.com/SignonURL');
 
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
@@ -254,7 +199,6 @@ class AuthenticationSignonTest extends PMATestCase
         $this->assertFalse(
             isset($_SESSION['LAST_SIGNON_URL'])
         );
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**
diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php
index 67daec5e18..dca9072f8c 100644
--- a/test/libraries/PMA_Form_Processing_test.php
+++ b/test/libraries/PMA_Form_Processing_test.php
@@ -17,7 +17,7 @@ require_once 'setup/lib/form_processing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
+class PMA_Form_Processing_Test extends PMATestCase
 {
     /**
      * Prepares environment for the test.
@@ -37,29 +37,11 @@ class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
      */
     public function testProcessFormSet()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->exactly(2))
-            ->method('header')
-            ->withConsecutive(
-                ['HTTP/1.1 303 See Other'],
-                ['Location: index.php?lang=en']
+        $this->mockResponse(
+                'HTTP/1.1 303 See Other',
+                'Location: index.php?lang=en'
             );
 
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
         // case 1
         $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
             ->disableOriginalConstructor()
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index 31a3f04828..c21a30ea2d 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -20,7 +20,7 @@ require_once 'libraries/relation.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
+class PMA_User_Preferences_Test extends PMATestCase
 {
 
     /**
@@ -368,25 +368,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
     {
         $GLOBALS['lang'] = '';
 
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash');
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
+        $this->mockResponse('Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash');
 
         $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
         $GLOBALS['PMA_Config']->set('PMA_IS_IIS', false);

From f98832c6919eaa7bb85cd0b3b5fbb81884c0b25f Mon Sep 17 00:00:00 2001
From: osaid <osaid.nasir@gmail.com>
Date: Sun, 8 Jan 2017 19:21:47 +0530
Subject: [PATCH 11/63] remove tab and unused code

Signed-off-by: osaid <osaid.nasir@gmail.com>
---
 test/classes/plugin/auth/AuthenticationSignonTest.php | 2 +-
 test/libraries/PMA_user_preferences_test.php          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php
index 2b18eea2af..0549ad335c 100644
--- a/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ b/test/classes/plugin/auth/AuthenticationSignonTest.php
@@ -40,7 +40,7 @@ class AuthenticationSignonTest extends PMATestCase
      */
     public function tearDown()
     {
-    	parent::tearDown();
+        parent::tearDown();
         unset($this->object);
     }
 
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index c21a30ea2d..535fabaebf 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -378,8 +378,6 @@ class PMA_User_Preferences_Test extends PMATestCase
             array('a' => 'b'),
             'h ash'
         );
-
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**

From cef6c51375496debf8260c17faffa5c847a68cca Mon Sep 17 00:00:00 2001
From: osaid <osaid.nasir@gmail.com>
Date: Sun, 8 Jan 2017 19:43:25 +0530
Subject: [PATCH 12/63] calling mockResponse() properly

Signed-off-by: osaid <osaid.nasir@gmail.com>
---
 test/libraries/PMA_Form_Processing_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php
index dca9072f8c..f7b2c77e34 100644
--- a/test/libraries/PMA_Form_Processing_test.php
+++ b/test/libraries/PMA_Form_Processing_test.php
@@ -38,8 +38,8 @@ class PMA_Form_Processing_Test extends PMATestCase
     public function testProcessFormSet()
     {
         $this->mockResponse(
-                'HTTP/1.1 303 See Other',
-                'Location: index.php?lang=en'
+                array('HTTP/1.1 303 See Other'),
+                array('Location: index.php?lang=en')
             );
 
         // case 1

From 410fa2a85bc16d2f6089b4c7cc61d261d0a9a8d5 Mon Sep 17 00:00:00 2001
From: Vinicius Dias <carlosv775@gmail.com>
Date: Mon, 9 Jan 2017 10:04:00 -0200
Subject: [PATCH 13/63] $param was not being used in mockResponse()

There was a parameter ($param) not being used in the mockResponse() method.
---
 test/PMATestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/PMATestCase.php b/test/PMATestCase.php
index d6f748eedc..418a635f47 100644
--- a/test/PMATestCase.php
+++ b/test/PMATestCase.php
@@ -27,7 +27,7 @@ class PMATestCase extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function mockResponse($param)
+    public function mockResponse()
     {
         $this->restoreInstance = PMA\libraries\Response::getInstance();
 

From 3b07b39c352437bf685b55b9011c565d463b8a34 Mon Sep 17 00:00:00 2001
From: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
Date: Mon, 9 Jan 2017 18:33:14 -0800
Subject: [PATCH 14/63] Fix PHP Notice 'Undefined index: row_format' when
 altering table options. Issue #12840 Signed-off-by: Tim McLaughlin
 <tim.j.mclaughlin@gmail.com>

---
 ChangeLog          | 1 +
 tbl_operations.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1f857d71ea..4b1a95b73f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #12826 Honor user configured connection collation
 - issue #12293 Correctly report OpenSSL errors from cookie encryption
 - issue #12814 DateTime won't allow to input length in Routine editor
+- issue #12840 Fix Notice regarding 'Undefined index: row_format' when altering table options
 - issue #12841 Fixed moving of columns with whitespace in name
 - issue #12847 Fixed editing of virtual columns
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
diff --git a/tbl_operations.php b/tbl_operations.php
index 3c3754d7f4..bbddbaf2ff 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -146,13 +146,17 @@ if (isset($_REQUEST['submitoptions'])) {
         $new_tbl_storage_engine = '';
     }
 
+    $row_format = (isset($create_options['row_format']))
+        ? $create_options['row_format']
+        : $pma_table->getStatusInfo('ROW_FORMAT');
+
     $table_alters = PMA_getTableAltersArray(
         $is_myisam_or_aria, $is_isam, $create_options['pack_keys'],
         (empty($create_options['checksum']) ? '0' : '1'),
         $is_aria,
         ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
         (empty($create_options['delay_key_write']) ? '0' : '1'),
-        $is_innodb, $is_pbxt, $create_options['row_format'],
+        $is_innodb, $is_pbxt, $row_format,
         $new_tbl_storage_engine,
         ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
         $tbl_collation

From bef006a92acae59fff893d57831eb0db761efd2b Mon Sep 17 00:00:00 2001
From: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
Date: Mon, 9 Jan 2017 18:45:38 -0800
Subject: [PATCH 15/63] Fix PHP notices and warning related to dbs_to_test
 global. Issue #12876 Signed-off-by: Tim McLaughlin
 <tim.j.mclaughlin@gmail.com>

---
 ChangeLog                               | 1 +
 libraries/navigation/NavigationTree.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1f857d71ea..b98e67af55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
 - issue #12872 Use same query for display and execution when dropping index
 - issue #12868 Fix check for user groups freatures being enabled
+- issue #12876 Fix notices and warning related to dbs_to_test global
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 2b7ca44a06..4ee837b36d 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -16,6 +16,8 @@ use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
 
+require_once 'libraries/check_user_privileges.lib.php';
+
 /**
  * Displays a collapsible of database objects in the navigation frame
  *

From 77c33d0444d500377d54cf97e640d70c865856c8 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Fri, 13 Jan 2017 17:50:07 -0500
Subject: [PATCH 16/63] Rename Relations to Relationships in many places; Fixes
 issue #12536

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog                                      |  1 +
 libraries/DisplayResults.php                   |  2 +-
 libraries/config/messages.inc.php              |  6 +++---
 .../table/TableRelationController.php          |  2 +-
 libraries/plugins/export/ExportSql.php         |  2 +-
 libraries/pmd_common.php                       | 18 +++++++++---------
 .../designer/delete_relation_panel.phtml       |  2 +-
 .../database/designer/new_relation_panel.phtml |  2 +-
 .../database/designer/options_panel.phtml      |  4 ++--
 templates/database/designer/side_menu.phtml    |  8 ++++----
 templates/database/designer/table_list.phtml   |  2 +-
 templates/table/relation/common_form.phtml     |  4 ++--
 test/classes/plugin/export/ExportSqlTest.php   |  2 +-
 13 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb31aa9f68..004b9cf5b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
 - issue #12799 Allow to configure signon session parameters
 - issue #12854 Drop database is broken
 - issue #12863 Can't toggle Event Scheduler on
+- issue #12536 Rename "Relations" to "Relationships" in many places as it's the more proper term
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index ec324e9c89..5226410d46 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -1742,7 +1742,7 @@ class DisplayResults
             $options_html .= '<div class="formelement">';
             $choices = array(
                 'K'   => __('Relational key'),
-                'D'   => __('Display column for relations')
+                'D'   => __('Display column for relationships')
             );
 
             $options_html .= Util::getRadioFields(
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 33bd8df169..8ddcc86585 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -164,7 +164,7 @@ $strConfigExport_latex_data_continued_caption_name = __('Continued table caption
 $strConfigExport_latex_data_label_name = __('Label key');
 $strConfigExport_latex_mime_name = __('MIME type');
 $strConfigExport_latex_null_name = __('Replace NULL with');
-$strConfigExport_latex_relation_name = __('Relations');
+$strConfigExport_latex_relation_name = __('Relationships');
 $strConfigExport_latex_structure_caption_name = __('Table caption');
 $strConfigExport_latex_structure_continued_caption_name
     = __('Continued table caption');
@@ -177,7 +177,7 @@ $strConfigExport_odt_columns_name = __('Put columns names in the first row');
 $strConfigExport_odt_comments_name = __('Comments');
 $strConfigExport_odt_mime_name = __('MIME type');
 $strConfigExport_odt_null_name = __('Replace NULL with');
-$strConfigExport_odt_relation_name = __('Relations');
+$strConfigExport_odt_relation_name = __('Relationships');
 $strConfigExport_odt_structure_or_data_name = __('Dump table');
 $strConfigExport_onserver_name = __('Save on server');
 $strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
@@ -218,7 +218,7 @@ $strConfigExport_sql_max_query_size_name = __('Maximal length of created query')
 $strConfigExport_sql_mime_name = __('MIME type');
 $strConfigExport_sql_procedure_function_name
     = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
-$strConfigExport_sql_relation_name = __('Relations');
+$strConfigExport_sql_relation_name = __('Relationships');
 $strConfigExport_sql_structure_or_data_name = __('Dump table');
 $strConfigExport_sql_type_name = __('Export type');
 $strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');
diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php
index bf561a8fb5..8685ffb4fe 100644
--- a/libraries/controllers/table/TableRelationController.php
+++ b/libraries/controllers/table/TableRelationController.php
@@ -279,7 +279,7 @@ class TableRelationController extends TableController
         ) {
             $this->response->addHTML(
                 Util::getMessage(
-                    __('Internal relations were successfully updated.'),
+                    __('Internal relationships were successfully updated.'),
                     '', 'success'
                 )
             );
diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
index 5b51c37b83..dd7c08d4b5 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/plugins/export/ExportSql.php
@@ -1875,7 +1875,7 @@ class ExportSql extends ExportPlugin
             $schema_create .= $this->_possibleCRLF()
                 . $this->_exportComment()
                 . $this->_exportComment(
-                    __('RELATIONS FOR TABLE') . ' '
+                    __('RELATIONSHIPS FOR TABLE') . ' '
                     . Util::backquote($table_alias, $sql_backquotes)
                     . ':'
                 );
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 1f8c976e6e..73b77dd7a6 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -548,7 +548,7 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
         if ($foreigner
             && isset($foreigner['constraint'])
         ) {
-            return array(false, __('Error: relation already exists.'));
+            return array(false, __('Error: relationship already exists.'));
         }
         // note: in InnoDB, the index does not requires to be on a PRIMARY
         // or UNIQUE key
@@ -594,13 +594,13 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
             }
             $upd_query .= ';';
             if ($GLOBALS['dbi']->tryQuery($upd_query)) {
-                return array(true, __('FOREIGN KEY relation has been added.'));
+                return array(true, __('FOREIGN KEY relationship has been added.'));
             }
 
             $error = $GLOBALS['dbi']->getError();
             return array(
                 false,
-                __('Error: FOREIGN KEY relation could not be added!')
+                __('Error: FOREIGN KEY relationship could not be added!')
                 . "<br/>" . $error
             );
         }
@@ -632,13 +632,13 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
 
     if (PMA_queryAsControlUser($q, false, PMA\libraries\DatabaseInterface::QUERY_STORE)
     ) {
-        return array(true, __('Internal relation has been added.'));
+        return array(true, __('Internal relationship has been added.'));
     }
 
     $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
     return array(
         false,
-        __('Error: Internal relation could not be added!')
+        __('Error: Internal relationship could not be added!')
         . "<br/>" . $error
     );
 }
@@ -676,13 +676,13 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
                 . '.' . PMA\libraries\Util::backquote($T2) . ' DROP FOREIGN KEY '
                 . PMA\libraries\Util::backquote($foreigner['constraint']) . ';';
             if ($GLOBALS['dbi']->query($upd_query)) {
-                return array(true, __('FOREIGN KEY relation has been removed.'));
+                return array(true, __('FOREIGN KEY relationship has been removed.'));
             }
 
             $error = $GLOBALS['dbi']->getError();
             return array(
                 false,
-                __('Error: FOREIGN KEY relation could not be removed!')
+                __('Error: FOREIGN KEY relationship could not be removed!')
                 . "<br/>" . $error
             );
         }
@@ -709,11 +709,11 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
         $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
         return array(
             false,
-            __('Error: Internal relation could not be removed!') . "<br/>" . $error
+            __('Error: Internal relationship could not be removed!') . "<br/>" . $error
         );
     }
 
-    return array(true, __('Internal relation has been removed.'));
+    return array(true, __('Internal relationship has been removed.'));
 }
 
 /**
diff --git a/templates/database/designer/delete_relation_panel.phtml b/templates/database/designer/delete_relation_panel.phtml
index cc905015e3..970baea359 100644
--- a/templates/database/designer/delete_relation_panel.phtml
+++ b/templates/database/designer/delete_relation_panel.phtml
@@ -18,7 +18,7 @@
                     <tr>
                         <td colspan="3" class="center nowrap">
                             <strong>
-                                <?= __('Delete relation'); ?>
+                                <?= __('Delete relationship'); ?>
                             </strong>
                         </td>
                     </tr>
diff --git a/templates/database/designer/new_relation_panel.phtml b/templates/database/designer/new_relation_panel.phtml
index bc449a0e53..60df319658 100644
--- a/templates/database/designer/new_relation_panel.phtml
+++ b/templates/database/designer/new_relation_panel.phtml
@@ -19,7 +19,7 @@
                         <tr>
                             <td colspan="2" class="center nowrap">
                                 <strong>
-                                    <?= __('Create relation'); ?>
+                                    <?= __('Create relationship'); ?>
                                 </strong>
                             </td>
                         </tr>
diff --git a/templates/database/designer/options_panel.phtml b/templates/database/designer/options_panel.phtml
index cfe9cbb51d..aa6b8314af 100644
--- a/templates/database/designer/options_panel.phtml
+++ b/templates/database/designer/options_panel.phtml
@@ -31,7 +31,7 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Relation operator'); ?>
+                                <?= __('Relationship operator'); ?>
                             </td>
                             <td width="102">
                                 <select name="rel_opt" id="rel_opt">
@@ -197,7 +197,7 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Relation operator'); ?>
+                                <?= __('Relationship operator'); ?>
                             </td>
                             <td width="102">
                                 <select name="h_rel_opt" id="h_rel_opt">
diff --git a/templates/database/designer/side_menu.phtml b/templates/database/designer/side_menu.phtml
index de50373d20..9615bcc53c 100644
--- a/templates/database/designer/side_menu.phtml
+++ b/templates/database/designer/side_menu.phtml
@@ -81,10 +81,10 @@ function getImg($path)
             </span>
         </a>
         <a href="#" class="M_butt" id="rel_button">
-            <img title="<?= __('Create relation'); ?>"
+            <img title="<?= __('Create relationship'); ?>"
                  src="<?= getImg('pmd/relation.png'); ?>" />
             <span class="hide hidable">
-                <?= __('Create relation'); ?>
+                <?= __('Create relationship'); ?>
             </span>
         </a>
         <a href="#" class="M_butt" id="display_field_button">
@@ -142,10 +142,10 @@ function getImg($path)
         </span>
     </a>
     <a href="#" id="relLineInvert" class="<?= $params_array['relation_lines']; ?>" >
-        <img title="<?= __('Toggle relation lines'); ?>"
+        <img title="<?= __('Toggle relationship lines'); ?>"
              src="<?= getImg('pmd/toggle_lines.png'); ?>" />
         <span class="hide hidable">
-            <?= __('Toggle relation lines'); ?>
+            <?= __('Toggle relationship lines'); ?>
         </span>
     </a>
     <?php if (! $visualBuilder) : ?>
diff --git a/templates/database/designer/table_list.phtml b/templates/database/designer/table_list.phtml
index 71d994444c..4deafb20ca 100644
--- a/templates/database/designer/table_list.phtml
+++ b/templates/database/designer/table_list.phtml
@@ -11,7 +11,7 @@
         <a href="#" class="M_butt" target="_self" >
             <img alt="v"
                  id="key_HS"
-                 title="<?= __('Hide/Show Tables with no relation'); ?>"
+                 title="<?= __('Hide/Show Tables with no relationship'); ?>"
                  src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
                  data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
                  data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" />
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index ddb0a333a9..ac96f38313 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -73,13 +73,13 @@
     <?php if ($cfgRelation['relwork']): ?>
         <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
             <br/>
-            <?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relations')) ?>
+            <?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relationships')) ?>
         <?php endif; ?>
 
         <?php $save_row = array_values($columns);
         $saved_row_cnt  = count($save_row);?>
         <fieldset>
-            <legend><?= __('Internal relations') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
+            <legend><?= __('Internal relationships') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
             <table id="internal_relations" class="relationalTable">
                 <tr>
                     <th><?= __('Column'); ?></th>
diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php
index 1e61253a12..d0f7ded559 100644
--- a/test/classes/plugin/export/ExportSqlTest.php
+++ b/test/classes/plugin/export/ExportSqlTest.php
@@ -1226,7 +1226,7 @@ class ExportSqlTest extends PMATestCase
         );
 
         $this->assertContains(
-            "-- RELATIONS FOR TABLE :\n" .
+            "-- RELATIONSHIPS FOR TABLE :\n" .
             "--   foo\n" .
             "--       ftable -> ffield",
             $result

From 3759b6d4cd905e972084e43145a04bb51a73e94c Mon Sep 17 00:00:00 2001
From: Jeremy G <gohydj2003@gmail.com>
Date: Sun, 15 Jan 2017 20:38:33 +0800
Subject: [PATCH 17/63] Add margin to the "add new column" text in central
 columns page

This is done by adding the existing top margin class found in existing css files
therefore does not require any changes to the css files

Signed-off-by: Jeremy G <gohydj2003@gmail.com>
---
 libraries/central_columns.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index c5294eaf21..19b3d049f6 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -1259,7 +1259,7 @@ function PMA_handleColumnExtra(&$columns_list)
  */
 function PMA_getHTMLforAddNewColumn($db)
 {
-    $addNewColumn = '<div id="add_col_div"><a href="#">'
+    $addNewColumn = '<div id="add_col_div" class="topmargin"><a href="#">'
         . '<span>+</span> ' . __('Add new column') . '</a>'
         . '<form id="add_new" style="min-width:100%;display:none" '
         . 'method="post" action="db_central_columns.php">'

From 4a2695cf5b209d18374ed6c339cefd33abfea15b Mon Sep 17 00:00:00 2001
From: Shreyas Sinha <shreyas.sinha14@gmail.com>
Date: Thu, 12 Jan 2017 08:50:07 +0530
Subject: [PATCH 18/63] Row coloring issue and incorrect table code Fixes issue
 #12831

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
---
 libraries/insert_edit.lib.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 9e71fcbda8..fc1d0a0eda 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -583,10 +583,6 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
     } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
         && mb_strstr($column['pma_type'], 'longtext')
     ) {
-        $html_output = '&nbsp;</td>';
-        $html_output .= '</tr>';
-        $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-            . '<td colspan="5" class="right">';
         $html_output .= PMA_getTextarea(
             $column, $backup_field, $column_name_appendix, $onChangeClause,
             $tabindex, $tabindex_for_value, $idindex, $text_dir,
@@ -2663,11 +2659,6 @@ function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix)
     $longDoubleTextArea = $GLOBALS['cfg']['LongtextDoubleTextarea'];
     return '<tr class="noclick ' . ($odd_row ? 'odd' : 'even' ) . '">'
         . '<td '
-        . ($longDoubleTextArea
-            && mb_strstr($column['True_Type'], 'longtext')
-            ? 'rowspan="2"'
-            : ''
-        )
         . 'class="center">'
         . $column['Field_title']
         . '<input type="hidden" name="fields_name' . $column_name_appendix
@@ -2942,9 +2933,6 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
             $no_support_types, $gis_data_types, $extracted_columnspec, $readOnly
         );
     }
-    $html_output .= '</td>'
-        . '</tr>';
-
     return $html_output;
 }
 

From 986035a716e690174141d6bd6a64d9562faa5fac Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 12 Jan 2017 14:58:22 -0500
Subject: [PATCH 19/63] Add ChangeLog entry for issue 12831

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 1f857d71ea..975ee27795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
 - issue #12872 Use same query for display and execution when dropping index
 - issue #12868 Fix check for user groups freatures being enabled
+- issue #12831 Fix table formatting on Insert tab, which mostly affected row highlighting
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

From eb2898527f44f1b0a397c84247d6fb27a2d8339f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 17 Jan 2017 17:22:21 +0100
Subject: [PATCH 20/63] Changelog entry for #12495 and #12875
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 975ee27795..0208f46c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
 - issue #12872 Use same query for display and execution when dropping index
 - issue #12868 Fix check for user groups freatures being enabled
 - issue #12831 Fix table formatting on Insert tab, which mostly affected row highlighting
+- issue #12495 Reintroduced phpinfo page with limited capabilities
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

From f1375a26a3c543d28621b7901d0433c0069004ab Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Tue, 17 Jan 2017 14:09:34 -0500
Subject: [PATCH 21/63] Remove dead code related to 4a2695c

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 libraries/insert_edit.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index fc1d0a0eda..2950e08608 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -2656,7 +2656,6 @@ function PMA_getHtmlForIgnoreOption($row_id, $checked = true)
  */
 function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix)
 {
-    $longDoubleTextArea = $GLOBALS['cfg']['LongtextDoubleTextarea'];
     return '<tr class="noclick ' . ($odd_row ? 'odd' : 'even' ) . '">'
         . '<td '
         . 'class="center">'

From 575f34953defbbe32dcd2622799b7f6493e70804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= <sevdimaliisayev@mail.ru>
Date: Tue, 17 Jan 2017 17:34:49 +0000
Subject: [PATCH 22/63] Translated using Weblate (Azerbaijani)

Currently translated at 53.3% (1718 of 3222 strings)

[CI skip]
---
 po/az.po | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/po/az.po b/po/az.po
index cd9ce2f03b..8981578829 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2016-11-08 18:50+0000\n"
+"PO-Revision-Date: 2017-01-17 17:34+0000\n"
 "Last-Translator: Sevdimali İsa <sevdimaliisayev@mail.ru>\n"
-"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/"
-"phpmyadmin/4-6/az/>\n"
+"Language-Team: Azerbaijani "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-6/az/>\n"
 "Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.9\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:38 license.php:33
 #, php-format
@@ -5829,7 +5829,7 @@ msgstr "Verilənləri daxil edərkən istifadə olunacaq sintaksis"
 #: libraries/config/messages.inc.php:217
 #: libraries/plugins/export/ExportSql.php:436
 msgid "Maximal length of created query"
-msgstr ""
+msgstr "Yaradılan sorğunun maksimal uzunluğu"
 
 #: libraries/config/messages.inc.php:223
 msgid "Export type"
@@ -5838,7 +5838,7 @@ msgstr "Eksport tipi"
 #: libraries/config/messages.inc.php:224
 #: libraries/plugins/export/ExportSql.php:136
 msgid "Enclose export in a transaction"
-msgstr ""
+msgstr "Tranzaksiya içində eksportu daxil et"
 
 #: libraries/config/messages.inc.php:225
 msgid "Export time in UTC"
@@ -5856,7 +5856,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:239
 msgid "A dropdown will be used if fewer items are present."
-msgstr ""
+msgstr "Az olarsa açılan menu istifadə olunacaq."
 
 #: libraries/config/messages.inc.php:240
 msgid "Foreign key limit"
@@ -5875,10 +5875,8 @@ msgid "Browse mode"
 msgstr ""
 
 #: libraries/config/messages.inc.php:246
-#, fuzzy
-#| msgid "Automatic recovery mode"
 msgid "Customize browse mode."
-msgstr "Avtomatik qurtarma rejimi"
+msgstr "Browse rejimini özəlləşdir."
 
 #: libraries/config/messages.inc.php:248 libraries/config/messages.inc.php:250
 #: libraries/config/messages.inc.php:268 libraries/config/messages.inc.php:281
@@ -5895,7 +5893,7 @@ msgstr "CSV verilenleri"
 
 #: libraries/config/messages.inc.php:251
 msgid "Developer"
-msgstr ""
+msgstr "Developer"
 
 #: libraries/config/messages.inc.php:252
 msgid "Settings for phpMyAdmin developers."

From ca2b0562293e3f8e592fbdb2db0cf0a27eddcd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= <sevdimaliisayev@mail.ru>
Date: Tue, 17 Jan 2017 17:34:53 +0000
Subject: [PATCH 23/63] Translated using Weblate (Azerbaijani)

Currently translated at 52.8% (1711 of 3239 strings)

[CI skip]
---
 po/az.po | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/po/az.po b/po/az.po
index ad47e86a55..184dba016d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2016-11-18 10:30+0000\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/az/>\n"
+"PO-Revision-Date: 2017-01-17 17:34+0000\n"
+"Last-Translator: Sevdimali İsa <sevdimaliisayev@mail.ru>\n"
+"Language-Team: Azerbaijani "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/az/>\n"
 "Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10-dev\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:39 license.php:34
 #, fuzzy, php-format
@@ -5920,7 +5920,7 @@ msgstr "Verilənləri daxil edərkən istifadə olunacaq sintaksis"
 #: libraries/config/messages.inc.php:217
 #: libraries/plugins/export/ExportSql.php:437
 msgid "Maximal length of created query"
-msgstr ""
+msgstr "Yaradılan sorğunun maksimal uzunluğu"
 
 #: libraries/config/messages.inc.php:223
 msgid "Export type"
@@ -5929,7 +5929,7 @@ msgstr "Eksport tipi"
 #: libraries/config/messages.inc.php:224
 #: libraries/plugins/export/ExportSql.php:137
 msgid "Enclose export in a transaction"
-msgstr ""
+msgstr "Tranzaksiya içində eksportu daxil et"
 
 #: libraries/config/messages.inc.php:225
 msgid "Export time in UTC"
@@ -5947,7 +5947,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:239
 msgid "A dropdown will be used if fewer items are present."
-msgstr ""
+msgstr "Az olarsa açılan menu istifadə olunacaq."
 
 #: libraries/config/messages.inc.php:240
 msgid "Foreign key limit"
@@ -5966,10 +5966,8 @@ msgid "Browse mode"
 msgstr ""
 
 #: libraries/config/messages.inc.php:246
-#, fuzzy
-#| msgid "Automatic recovery mode"
 msgid "Customize browse mode."
-msgstr "Avtomatik qurtarma rejimi"
+msgstr "Browse rejimini özəlləşdir."
 
 #: libraries/config/messages.inc.php:248 libraries/config/messages.inc.php:250
 #: libraries/config/messages.inc.php:268 libraries/config/messages.inc.php:281
@@ -5986,7 +5984,7 @@ msgstr "CSV verilenleri"
 
 #: libraries/config/messages.inc.php:251
 msgid "Developer"
-msgstr ""
+msgstr "Developer"
 
 #: libraries/config/messages.inc.php:252
 msgid "Settings for phpMyAdmin developers."

From 583e5e660a6d3b6dd12521e1135eefc2edbb766c Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Tue, 17 Jan 2017 21:41:26 -0500
Subject: [PATCH 24/63] Remove dead code and strings relating to xls/xlsx
 import and export. This code was removed in 3.4.5.0 but some strings and
 tests remained.

Fixes #12742

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog                         |  1 +
 export.php                        |  8 +---
 libraries/config.default.php      | 65 +------------------------------
 libraries/config.values.php       |  4 +-
 libraries/config/messages.inc.php |  6 ---
 5 files changed, 5 insertions(+), 79 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d44a3a6357..2bf5f05a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
 - issue #12799 Allow to configure signon session parameters
 - issue #12854 Drop database is broken
 - issue #12863 Can't toggle Event Scheduler on
+- issue #12742 Finish removing dead code references to xls/xlsx import and export, which was removed some time ago.
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/export.php b/export.php
index 091d41ad96..d1317ff565 100644
--- a/export.php
+++ b/export.php
@@ -186,9 +186,6 @@ $export_plugin = PMA_getPlugin(
     )
 );
 
-// Backward compatibility
-$type = $what;
-
 // Check export type
 if (empty($export_plugin)) {
     PMA_fatalError(__('Bad type!'));
@@ -318,13 +315,12 @@ if ($what == 'sql') {
     $crlf = PMA\libraries\Util::whichCrlf();
 }
 
-$output_kanji_conversion = Encoding::canConvertKanji() && $type != 'xls';
+$output_kanji_conversion = Encoding::canConvertKanji();
 
 // Do we need to convert charset?
 $output_charset_conversion = $asfile
     && Encoding::isSupported()
-    && isset($charset) && $charset != 'utf-8'
-    && $type != 'xls';
+    && isset($charset) && $charset != 'utf-8';
 
 // Use on the fly compression?
 $GLOBALS['onfly_compression'] = $GLOBALS['cfg']['CompressOnFly']
diff --git a/libraries/config.default.php b/libraries/config.default.php
index d607783006..a6fcca38cd 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1400,7 +1400,7 @@ $cfg['RowActionType'] = 'both';
 $cfg['Export'] = array();
 
 /**
- * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xls/xml/yaml
+ * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xml/yaml
  *
  * @global string $cfg['Export']['format']
  */
@@ -1616,48 +1616,6 @@ $cfg['Export']['texytext_columns'] = false;
  */
 $cfg['Export']['texytext_null'] = 'NULL';
 
-/**
- *
- *
- * @global boolean $cfg['Export']['xls_columns']
- */
-$cfg['Export']['xls_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_structure_or_data']
- */
-$cfg['Export']['xls_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_null']
- */
-$cfg['Export']['xls_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['xlsx_columns']
- */
-$cfg['Export']['xlsx_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_structure_or_data']
- */
-$cfg['Export']['xlsx_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_null']
- */
-$cfg['Export']['xlsx_null'] = 'NULL';
-
 /**
  *
  *
@@ -2373,27 +2331,6 @@ $cfg['Import']['ods_recognize_percentages'] = true;
  */
 $cfg['Import']['ods_recognize_currency'] = true;
 
-/**
- *
- *
- * @global string $cfg['Import']['xml_col_names']
- */
-$cfg['Import']['xls_col_names'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['xml_empty_rows']
- */
-$cfg['Import']['xls_empty_rows'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['xlsx_col_names']
- */
-$cfg['Import']['xlsx_col_names'] = false;
-
 /*******************************************************************************
  * Schema export defaults
 */
diff --git a/libraries/config.values.php b/libraries/config.values.php
index bc7786fc17..b4082ded56 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -174,7 +174,7 @@ $cfg_db['Export']['method'] = array(
 );
 $cfg_db['Export']['format'] = array(
     'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods',
-    'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml', 'yaml'
+    'odt', 'pdf', 'sql', 'texytext', 'xml', 'yaml'
 );
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip');
 $cfg_db['Export']['charset'] = array_merge(
@@ -203,8 +203,6 @@ $cfg_db['Export']['sql_insert_syntax'] = array(
     'both'     => __('both of the above'),
     'none'     => __('neither of the above')
 );
-$cfg_db['Export']['xls_null'] = 'short_string';
-$cfg_db['Export']['xlsx_null'] = 'short_string';
 $cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['htmlword_null'] = 'short_string';
 $cfg_db['Export']['ods_null'] = 'short_string';
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 151c9dfad8..3dc80dda96 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -226,10 +226,6 @@ $strConfigExport_sql_utc_time_name = __('Export time in UTC');
 $strConfigExport_texytext_columns_name = __('Put columns names in the first row');
 $strConfigExport_texytext_null_name = __('Replace NULL with');
 $strConfigExport_texytext_structure_or_data_name = __('Dump table');
-$strConfigExport_xls_columns_name = __('Put columns names in the first row');
-$strConfigExport_xls_null_name = __('Replace NULL with');
-$strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
-$strConfigExport_xlsx_null_name = __('Replace NULL with');
 $strConfigForeignKeyDropdownOrder_desc = __(
     'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is '
     . 'the referenced data, [kbd]id[/kbd] is the key value.'
@@ -402,8 +398,6 @@ $strConfigImport_sql_compatibility_name = __('SQL compatibility mode');
 $strConfigImport_sql_no_auto_value_on_zero_name
     = __('Do not use AUTO_INCREMENT for zero values');
 $strConfigImport_sql_read_as_multibytes_name = __('Read as multibytes');
-$strConfigImport_xls_col_names_name = __('Column names in first row');
-$strConfigImport_xlsx_col_names_name = __('Column names in first row');
 $strConfigInitialSlidersState_name = __('Initial state for sliders');
 $strConfigInsertRows_desc = __('How many rows can be inserted at one time.');
 $strConfigInsertRows_name = __('Number of inserted rows');

From 93565658406a0426ac1de82caef0d293df0bdf2e Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Tue, 17 Jan 2017 22:28:04 -0500
Subject: [PATCH 25/63] Archive 2016 ChangeLog entries to the history
 repository

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog | 405 ------------------------------------------------------
 1 file changed, 405 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d44a3a6357..43d88b4f3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,411 +74,6 @@ phpMyAdmin - ChangeLog
 - issue #12831 Fix table formatting on Insert tab, which mostly affected row highlighting
 - issue #12495 Reintroduced phpinfo page with limited capabilities
 
-4.6.5.2 (2016-12-05)
-- issue #12765 Fixed SQL export with newlines
-
-4.6.5.1 (2016-11-25)
-- issue #12735 Incorrect parameters to escapeString in Node.php
-- issue #12734 Fix PHP error when mbstring is not installed
-- issue #12736 Don't force partition count to be specified when creating a new table
-
-4.6.5 (2016-11-24)
-- issue        Remove potentionally license problematic sRGB profile
-- issue #12459 Display read only fields as read only when editing
-- issue #12384 Fix expanding of navigation pane when clicking on database
-- issue #12430 Impove partitioning support
-- issue #12374 Reintroduced simplified PmaAbsoluteUri configuration directive
-- issue        Always use UTC time in HTTP headers
-- issue #12479 Simplified validation of external links
-- issue #12483 Fix browsing tables with built in transformations
-- issue #12485 Do not show warning about short blowfish_secret if none is set
-- issue #12251 Fixed random logouts due to wrong cookie path
-- issue #12480 Fixed editing of ENUM/SET/DECIMAL fields structure
-- issue #12497 Missing escaping of configuration used in SQL (hide_db and only_db)
-- issue #12476 Add error checking in reading advisory rules file
-- issue #12477 Add checking missing elements and confirming element types from json_decode
-- issue #12251 Automatically save SQL query in browser local storage rather than in cookie
-- issue #12292 Unable to edit transformations
-- issue #12502 Remove unused paramenter when connecting to MySQLi
-- issue #12303 Fix number formatting with different settings of precision in PHP
-- issue #12405 Use single quotes in PHP code
-- issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped
-- issue #12531 Properly detect DROP DATABASE queries
-- issue #12470 Fix possible race condition in setting URL hash
-- issue #11924 Remove caching of server information
-- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
-- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries
-- issue #12473 Code can throw unhandled exception
-- issue #12550 Do not try to keep alive session even after expiry
-- issue #12512 Fixed rendering BBCode links in setup
-- issue #12518 Fixed copy of table with generated columns
-- issue #12221 Fixed export of table with generated columns
-- issue #12320 Copying a user does not copy usergroup
-- issue #12272 Adding a new row with default enum goes to no selection when you want to add more then 2 rows
-- issue #12487 Drag and drop import prevents file dropping to blob column file selector on the insert tab
-- issue #12554 Absence of scrolling makes it impossible to read longer text values in grid editing
-- issue #12530 "Edit routine" crashes when the current user is not the definer, even if privileges are adequate
-- issue #12300 Export selective tables by-default dumps Events also
-- issue #12298 Fixed export of view definitions
-- issue #12242 Edit routine detail dialog does not fill "Return length" field in mysql functions
-- issue #12575 New index Confirm adds whitespace around the field name
-- issue #12382 Bug in zoom search
-- issue #12321 Assign LIMIT clause only to syntactically correct queries
-- issue #12461 Can't Execute SQL With Sub-Query Due To "LIMIT 0,25" Inserted At Wrong Place
-- issue #12511 Clarify documentation on ArbitraryServerRegexp
-- issue #12508 Remove duplicate code in SQL escaping
-- issue #12475 Cleanup code for getting table information
-- issue #12579 phpMyAdmin's export of a Select statment without a FROM clause generates Wrong SQL
-- issue #12316 Correct export of complex SELECT statements
-- issue #12080 Fixed parsing of subselect queries
-- issue #11740 Fixed handling DELETE ... USING queries
-- issue #12100 Fixed handling of CASE operator
-- issue #12455 Query history stores separate entry for every letter typed
-- issue #12327 Create PHP code no longer works
-- issue #12179 Fixed bookmarking of query with multiple statements
-- issue #12419 Wrong description on GRANT OPTION
-- issue #12615 Fixed regexp for matching browser versions
-- issue #12569 Avoid showing import errors twice
-- issue #12362 prefs_manage.php can leave an orphaned temporary file
-- issue #12619 Unable to export csv when using union select
-- issue #12625 Broken Edit links in query results of JOIN query
-- issue #12634 Drop DB error in import if DB doesn't exist
-- issue #12338 Designer reverts to first saved ER after EACH relation create or delete
-- issue #12639 'Show trace' in Console generates JS error for functions in query's trace called without any arguments
-- issue #12366 Fix user creation with certain MariaDB setups
-- issue #12616 Refuse to work with mbstring.func_overload enabled
-- issue #12472 Properly report connection without password in setup
-- issue #12365 Fix records count for large tables
-- issue #12533 Fix records count for complex queries
-- issue #12454 Query history not updated in console until page refresh
-- issue #12344 Fixed parsing of labels in loop
-- issue #12228 Fixed parsing of BEGIN labels
-- issue #12637 Fixed editing some timestamp values
-- issue #12622 Fixed javascript error in designer
-- issue #12334 Missing page indicator or VIEWs
-- issue #12610 Export of tables with Timestamp/Datetime/Time columns defined with ON UPDATE clause with precision fails
-- issue #12661 Error inserting into pma__history after timeout
-- issue #12195 Row_format = fixed not visible
-- issue #12665 Cannot add a foreign key - non-indexed fields not listed in InnoDB tables
-- issue #12674 Allow for proper MySQL-allowed strings as identifiers
-- issue #12651 Allow for partial dates on table insert page
-- issue #12681 Fixed designer with tables using special chars
-- issue #12652 Fixed visual query builder for foreign keys with more fields
-- issue #12257 Improved search page performance
-- issue #12322 Avoid selecting default function for foreign keys
-- issue #12453 Fixed escaping of SQL parts in some corner cases
-- issue #12542 Missing table name in account privileges editor
-- issue #12691 Remove ksort call on empty array in PMA_getPlugins function
-- issue #12443 Check parameter type before processing
-- issue #12299 Avoid generating too long URLs in search
-- issue #12361 Fix self SQL injection in table-specific privileges
-- issue #12698 Add link to release notes and download on new version notification
-- issue #12712 Error when trying to setup replication (fatal error in call to an old PMA_DBI_connect function)
-- issue        [security] Unsafe generation of $cfg['blowfish_secret'], see PMASA-2016-58
-- issue        [security] phpMyAdmin's phpinfo functionality is removed, see PMASA-2016-59
-- issue        [security] AllowRoot and allow/deny rule bypass with specially-crafted username, see PMASA-2016-60
-- issue        [security] Username matching weaknesses with allow/deny rules, see PMASA-2016-61
-- issue        [security] Possible to bypass logout timeout, see PMASA-2016-62
-- issue        [security] Full path disclosure (FPD) weaknesses, see PMASA-2016-63
-- issue        [security] Multiple XSS weaknesses, see PMASA-2016-64
-- issue        [security] Multiple denial-of-service (DOS) vulnerabilities, see PMASA-2016-65
-- issue        [security] Possible to bypass white-list protection for URL redirection, see PMASA-2016-66
-- issue        [security] BBCode injection to login page, see PMASA-2016-67
-- issue        [security] Denial-of-service (DOS) vulnerability in table partitioning, see PMASA-2016-68
-- issue        [security] Multiple SQL injection vulnerabilities, see PMASA-2016-69
-- issue        [security] Incorrect serialized string parsing, see PMASA-2016-70
-- issue        [security] CSRF token not stripped from the URL, see PMASA-2016-71
-
-4.6.4 (2016-08-16)
-- issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
-- issue        [security] Improve session cookie code for openid.php and signon.php example files
-- issue        [security] Full path disclosure in openid.php and signon.php example files
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-30
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-31
-- issue        [security] Unsafe generation of BlowfishSecret (when not supplied by the user)
-- issue        [security] Referrer leak when phpinfo is enabled
-- issue        [security] PHP code injection, see PMASA-2016-32
-- issue        [security] Full path disclosure, see PMASA-2016-33
-- issue        [security] SQL injection attack, see PMASA-2016-34
-- issue        [security] Local file exposure through LOAD DATA LOCAL INFILE, see PMASA-2016-35
-- issue        [security] Local file exposure through symlinks with UploadDir, see PMASA-2016-36
-- issue        [security] Path traversal with SaveDir and UploadDir, see PMASA-2016-37
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-38
-- issue        [security] SQL injection vulnerability as control user, see PMASA-2016-39
-- issue        [security] SQL injection vulnerability, see PMASA-2016-40
-- issue        [security] Denial-of-service attack through transformation feature, see PMASA-2016-41
-- issue        [security] SQL injection vulnerability as control user, see PMASA-2016-42
-- issue        [security] Verify data before unserializing, see PMASA-2016-43
-- issue        [security] Use HTTPS for wiki links
-- issue        Remove Swekey support
-- issue        [security] Denial-of-service attack with $cfg['AllowArbitraryServer'] = true and persistent connections, see PMASA-2016-45
-- issue        [security] Improve SSL certificate handling
-- issue        [security] Fix full path disclosure in debugging code
-- issue        [security] Possible circumvention of IP-based allow/deny rules with IPv6 and proxy server, see PMASA-2016-47
-- issue        [security] Detect if user is logged in, see PMASA-2016-48
-- issue        [security] Bypass URL redirection protection, see PMASA-2016-49
-- issue        [security] Referrer leak, see PMASA-2016-50
-- issue        [security] Reflected File Download, see PMASA-2016-51
-- issue        [security] ArbitraryServerRegexp bypass, see PMASA-2016-52
-- issue        [security] Denial-of-service attack by entering long password, see PMASA-2016-53
-- issue        [security] Remote code execution vulnerability when running as CGI, see PMASA-2016-054
-- issue        [security] Administrators could trigger SQL injection attack against users
-- issue        [security] Denial-of-service attack when PHP uses dbase extension, see PMASA-2016-55
-- issue        [security] Remove tode execution vulnerability when PHP uses dbase extension, see PMASA-2016-56
-- issue        [security] Denial-of-service attack by using for loops, see PMASA-2016-46
-- issue        Include X-Robots-Tag header in responses
-- issue        Enforce numeric field length when creating table
-- issue        Fixed invalid Content-Length in some HTTP responses
-- issue #12394 Create view should require a view name
-- issue #12391 Message with 'Change password successfully' displayed, but does not take effect
-- issue        Tighten control on PHP sessions and session cookies
-- issue #12409 Re-enable overhead on server databases view
-- issue #12414 Fixed rendering of Original theme
-- issue #12413 Fixed deleting users in non English locales
-- issue #12416 Fixed replication status output in Databases listing
-- issue #12303 Avoid typecasting to float when not needed
-- issue #12425 Duplicate message variable names in messages.inc.php
-- issue #12399 Adding index to table shows wrong top navigation
-- issue #12424 Fixed password change on MariaDB without auth plugin
-- issue #12339 Do not error on unset server port
-- issue #12422 Improvements to the original theme
-- issue #12395 Do not try to load old transformation plugins
-- issue #12423 Fixed replication status in database listing
-- issue #12433 Copy table with prefix does not copy the indexes
-- issue #12375 Search in database: Window content is not scrolling down when clicking first time on Browse link
-- issue #12346 SQL Editor textareas can have their size increased from the top, distorting the page view
-
-4.6.3 (2016-06-23)
-- issue #12249 Fixed cookie path on Windows
-- issue #12279 Fixed error reporting on connect problems
-- issue #12290 Fixed export of tables without explicitly set engine
-- issue #12285 Designer JavaScript error: Show/Hide tables list
-- issue #12293 Fix MySQL SSL connection with some PHP versions
-- issue #12279 Fix MySQL connection error on version mismatch
-- issue #12281 Keep user attributes (privileges, authentication mode, etc) when copying a user
-- issue #12308 Fix division by zero in case of misconfigured MySQL server
-- issue #12317 Fix editing server variables
-- issue #12303 Fix table size calculation in some circumstances
-- issue #12310 Fix listing routines for non privileged user
-- issue        Escape generated query in exporting a database
-- issue        Setup script doesn't use input type 'password' in all relevant locations
-- issue        [security] BBCode injection in setup script, see PMASA-2016-17
-- issue        [security] Cookie attribute injection attack, see PMASA-2016-18
-- issue        Redirect loop when directly calling url.php
-- issue        [security] SQL injection attack, see PMASA-2016-19
-- issue        [security] XSS attack in Table Structure page, see PMASA-2016-20
-- issue        [security] XSS attack in Server Privileges page, see PMASA-2016-21
-- issue        [security] DOS attack vulnerability, see PMASA-2016-22
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-23
-- issue        [security] Full path disclosure when running in debug mode
-- issue        [security] XSS attack with partition range and table structure, see PMASA-2016-25
-- issue        [security] XSS attack when checking database privileges, see PMASA-2016-26
-- issue        [security] XSS attack when MySQL server is using a specific payload log_bin directive, see PMASA-2016-26
-- issue        [security] XSS vulnerabilities in Transformation feature, see PMASA-2016-26
-
-4.6.2 (2016-05-25)
-- issue        [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14
-- issue        [security] Self XSS vulneratbility, see PMASA-2016-16
-- issue #12225 Use https for documentation links
-- issue #12234 Fix schema export with too many tables
-- issue #12240 Avoid parsing non JSON responses as JSON
-- issue #12244 Avoid using too log URLs when getting javascripts
-- issue #12118 Fixed setting mixed case languages
-- issue #12229 Avoid storing objects in session when debugging SQL
-- issue #12249 Fix cookie path on IIS
-- issue #11705 Fix occassional 200 errors on Windows
-- issue #12219 Fix locking issues when importing SQL
-- issue #12231 Avoid confusing warning when mysql extension is missing
-- issue        Improve handling of logout
-- issue        Safer handling of sessions during authentication
-- issue #12209 Fix server selection on main page
-- issue #12192 Avoid storing full error data in session
-- issue #12082 Fixed export of ARCHIVE tables with keys
-- issue #11565 Add session reload for config authentication
-- issue #12229 Do not fail on errors stored in session
-- issue #12248 Fix loading of APC based upload progress bar
-
-4.6.1 (2016-05-02)
-- issue #12120 PMA_Util not found in insert_edit.lib.php
-- issue #12118 Fixed activation of some languages
-- issue #12121 Fixed error in 3NF step of normalization
-- issue #12135 Fix offering JSON datatype in incompatible MySQL versions
-- issue #12132 Can not open table with JSON field
-- issue #12125 Cannot highlight a column if I scroll down from the top of the table
-- issue #12154 Fixed possible PHP error in SQL parser
-- issue #12029 Fixed SQL quoting in SQL export
-- issue #12129 Improve performance of database structure page
-- issue #12159 Fix PHP error if user did unpack new version over old one
-- issue #12165 Fix parsing of expression 0
-- issue #12146 Document setup with Google Cloud SQL
-- issue #12197 Fix parsing of queries with double \
-- issue #12202 Fixed setting of language from user configuration
-- issue #12200 Fixed check for ndb version
-- issue #12206 Fixed loading of configuration file
-- issue #12204 Check if sessions are working and report failures
-- issue #12211 non-clickable initial letter for users / and can't modify users with MySQL 5.7.12
-- issue #12215 Fixed config tab persistence errors
-- issue #12217 Fixed javascript erros on user creation
-- issue #12144 Fixed parsing of some AS clauses
-- issue #12205 Fixed parsing of FULL OUTER JOIN queries
-- issue #12171 Fixed editing of VIEW structure
-- issue #12208 Avoid printing executed queries on import
-
-4.6.0.0 (2016-03-22)
-+ issue #11456 Disabled storage engines
-+ issue #11479 Allow setting routine wise privileges
-- issue        Hide Insert tab for non-updatable views
-+ issue #11490 UI for defining partitioning in create table window
-+ issue #11438 Support JSON data type
-+ issue        Editing partitions in table Structure
-- issue        Tracking does not make sense for information_schema
-- issue #11550 Regression in Find and replace
-+ issue #11619 TokuDB Tables Show Size as "unknown"
-+ issue #11654 Use a slider for Internal relations
-+ issue #11641 Ability to disable the navigationhiding Feature
-- issue #11647 Restrict configuration NavigationTreeDbSeparator to strings
-- issue #11667 Disable the tooltip in the navigation panel's filter box
-+ issue        Copy results to clipboard
-+ issue #11504 Reactivate cut&paste possibility in print view
-- issue #11702 Extraneous message after edit + grid-edit
-- issue #11668 Table header is empty with browsing an empty table
-+ issue #11701 Allow changing parameter order of routines
-- issue #11708 Remove no password warning
-+ issue #11711 Clarify the meaning of "Stand-in structure for view" in SQL export
-- issue        HTML line break shown after a MySQL connection error message
-- issue #11728 CSV import skip row count after
-- issue        Fixed displaying of SQL query on table operations
-- issue #6321  Display binary strings as text if they are valid UTF-8
-+ issue #11743 Display routine specific privileges
-+ issue #11538 Copy multiple tables to database
-+ issue        Support Cloudflare Flexible SSL
-- issue        Handle empty TABLE_COMMENT
-+ issue #11833 Drop support for old Internet Explorer versions
-+ issue #11796 Use modals for displaying forms in db structure page
-+ issue #11789 Show MySQL error messages in user language
-+ issue        Add 'ssl_verify' configuration directive for self-signed certificates with mysqlnd and PHP >= 5.6
-+ issue #11874 Show more used PHP extensions
-- issue #11874 Report when version check and error reporting are disabled
-- issue #11849 Fix PDF schema export
-- issue #11412 Remove ForceSSL configuration directive
-- issue        Remove support for Mozilla Prism
-- issue #11412 Remove PmaAbsoluteUri configuration directive
-- issue #11914 Fix autoloading of phpseclib
-- issue #11880 Fixed rendering of missing extension error
-- issue #11923 Errors on Structure tab when user only has select access on certain columns
-- issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']
-- issue #11907 Avoid displaying UPDATE query twice
-- issue #11850 Fixed CSV import
-- issue        Fix SQL syntax highlighting in database search page
-- issue #12056 Fix error when we can not generate random string
-- issue #12055 Fixed PHP syntax error in templates
-- issue #12054 Fixed processing of queries with escaped quotes
-- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT
-- issue #12073 Hide edit and delete buttons when the results are not related to a table
-- issue #12083 Fixed parsing of field definition
-- issue #12081 Fixed rendering of table stats
-- issue #11705 Fixed problems with PHP on Windows on table structure
-- issue #12085 Like search strings being escaped incorrectly
-- issue #12092 Rename exported databases/tables doesn't seem to work
-- issue #12099 Undefined index: controllink
-- issue #12094 PHP Fatal error: Call to undefined function __()
-- issue #12098 Fix login after logout with http authentication
-- issue #12074 Fixed possible invalid SQL export
-- issue #12026 Fixed parsing of UNION SELECT with brackets
-- issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT
-- issue #12105 Multi-server drap-and-drop import always fails
-- issue #12116 Fulltext indexes are not copied when using copy database function
-
-4.5.5.1 (2016-02-29)
-- issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.
-- issue #11982 Row count wrong when grouping joined tables.
-- issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty.
-- issue #12020 New statement but no delimiter and unexpected token with REPLACE.
-- issue #12029 Fixed incorrect usage of SQL parser context in SQL export
-- issue        [security] XSS vulnerability in SQL parser, see PMASA-2016-10.
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-11.
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-12.
-- issue        [security] Vulnerability allowing man-in-the-middle attack on API call to GitHub, see PMASA-2016-13.
-- issue #12048 Fixed inclusion of gettext library from SQL parser
-
-4.5.5.0 (2016-02-22)
-- issue        Undefined index: is_ajax_request
-- issue #11855 Fix password change on MariaDB 10.1 and newer
-- issue #11874 Validate version information before further processing it
-- issue #11881 Full processlist lost on refresh
-- issue #11834 Adjust privileges fails if database name contains underscores
-- issue #11906 'Loading...' banner shows on login screen
-- issue #11930 Fixed changing of table parameters, eg. AUTO_INCREMENT
-- issue #11885 Call to undefined function SqlParser\ctype_alnum()
-- issue #11879 4.5.3.1 - NOW() function not recognized by parser
-- issue #11867 Gracefully handle the DESC statement
-- issue #11843 Fractional timestamp causes corrupted SQL export
-- issue #11836 Static analysis error for valid WHERE condition with IF keyword
-- issue #11800 Syntax Verifier error using REGEXP in SQL statement
-- issue #11799 Backslashes in comments are being interpreted as escape characters
-- issue #11909 Can't insert row into table that contains generated column
-- issue #11677 sql-parser and php-gettext collide.
-- issue #11920 Can't disable backquotes in export
-- issue #11911 Inserts via tbl_change.php in VARBINARY columns does not allow using HEX() and MD5()
-- issue #11939 Correct content type for uploaded error reports
-- issue #11940 Silent errors from checking local documentation
-- issue #11944 Fixed error on servers with disabled php_uname
-- issue #11946 Correctly store and report file upload errors
-- issue #11948 Avoid javascript errors on invalid location hash
-- issue #11950 Fix PHP warning on configuration errors
-- issue #11951 Silent errors on checking for writable folders
-- issue #11952 Silent warning on invalid file upload
-- issue #11953 Do not fail getting filename with open_basedir limitations
-- issue #11956 unrecognized keyword interval
-- issue        Field names and aliases are being correctly parsed now.
-- issue #11959 Fix javascript error in setup
-- issue #11964 Undefined index: TABLE_COMMENT in database structure page
-- issue #11967 Fix PHP error on loading invalid XML or ODS file
-- issue #11969 Missing confirmation while dropping a view in view_operations.php
-- issue #11968 Fix export of index comments in SQL
-- issue #11979 DECLARE not accepted as valid SQL
-
-4.5.4.1 (2016-01-29)
-- issue #11892 Error with PMA 4.4.15.3
-- issue #11896 Remove hard dependency on phpseclib
-
-4.5.4.0 (2016-01-28)
-- issue #11724 live data edit of big sets is not working
-- issue        Table list not saved in db QBE bookmarked search
-- issue #11777 While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
-- issue #11783 Avoid syntax error in javascript messages on invalid PHP setting for max_input_vars
-- issue #11784 Properly handle errors in upacking zip archive
-- issue #11785 Set PHP's internal encoding to UTF-8
-- issue #11786 Fixed Kanji encoding in some specific cases
-- issue #11787 Check whether iconv works before using it
-- issue #11788 Avoid conversion of MySQL error messages
-- issue #11792 Undefined index: parameters
-- issue #11802 Undefined index: field_name_orig
-- issue        Undefined index: host
-- issue #11810 'Add to central columns' (per column button) does nothing
-- issue #11727 SQL duplicate entry error trying to INSERT in designer_settings table
-- issue #11798 Fix handling of databases with dot in a name
-- issue #11820 Fix hiding of page content behind menu
-- issue #11780 FROM clause not generated after loading search bookmark
-- issue #11826 Fix creating/editing VIEW with DEFINER containing special chars
-- issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables
-- issue #11804 Misleading message for configuration storage
-- issue #11772 Table pagination does nothing when session expired
-- issue #11840 Index comments not working properly
-- issue #11791 Better handle local storage errors
-- issue #11752 Improve detection of privileges for privilege adjusting
-- issue #11854 Undefined property: stdClass::$releases at version check when disabled in config
-- issue #11814 SQL comment and variable stripped from bookmark on save
-- issue        Gracefully handle errors in regex based javascript search
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-1
-- issue        [security] Unsafe generation of CSRF token, see PMASA-2016-2
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-3
-- issue        [security] Insecure password generation in JavaScript, see PMASA-2016-4
-- issue        [security] Unsafe comparison of CSRF token, see PMASA-2016-5
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-6
-- issue        [security] XSS vulnerability in normalization page, see PMASA-2016-7
-- issue        [security] Full path disclosure vulnerability in SQL parser, see PMASA-2016-8
-- issue        [security] XSS vulnerability in SQL editor, see PMASA-2016-9
 
          --- Older ChangeLogs can be found on our project website ---
                      https://www.phpmyadmin.net/old-stuff/ChangeLogs/

From c99e070642120b0dc7ccc0e5498377c7d4331415 Mon Sep 17 00:00:00 2001
From: Giovanni Sora <g.sora@tiscali.it>
Date: Tue, 17 Jan 2017 21:58:51 +0000
Subject: [PATCH 26/63] Translated using Weblate (Interlingua)

Currently translated at 76.1% (2465 of 3239 strings)

[CI skip]
---
 po/ia.po | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/po/ia.po b/po/ia.po
index b1f12dd14d..bddc5b495b 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2016-12-21 21:16+0000\n"
+"PO-Revision-Date: 2017-01-17 21:58+0000\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/ia/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:39 license.php:34
 #, php-format
@@ -2191,12 +2191,16 @@ msgid ""
 "MySQL accepts additional values not selectable by the slider; key in those "
 "values directly if desired"
 msgstr ""
+"MySQL accepta valores additional non selectionabile per le slider; si tu "
+"vole pote insertar directemente celle valores"
 
 #: js/messages.php:534
 msgid ""
 "MySQL accepts additional values not selectable by the datepicker; key in "
 "those values directly if desired"
 msgstr ""
+"MySQL accepta valores additional non selectionabile per le selector de datas:"
+" si tu vole pote insertar celle valores directemente"
 
 #: js/messages.php:540
 msgid ""
@@ -10329,6 +10333,8 @@ msgid ""
 "Include a timestamp of when databases were created, last updated, and last "
 "checked"
 msgstr ""
+"Include un timestamp (marca de tempore) de quando le base de datos esseva "
+"create, le ultime actualisation e le ultime controlo"
 
 #: libraries/plugins/export/ExportSql.php:172
 msgid "Export metadata"
@@ -10887,7 +10893,7 @@ msgstr "Validation falleva per le catena de ingresso %s."
 
 #: libraries/plugins/transformations/abs/SQLTransformationsPlugin.php:29
 msgid "Formats text as SQL query with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como query de SQL con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php:28
 msgid ""
@@ -10903,6 +10909,8 @@ msgid ""
 "File upload functionality for TEXT columns. It does not have a textarea for "
 "input."
 msgstr ""
+"Functionalitate de incargamento de file per columnas de TEXT. Il non ha un "
+"textarea per le ingresso."
 
 #: libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php:33
 msgid ""
@@ -10920,19 +10928,19 @@ msgstr ""
 
 #: libraries/plugins/transformations/input/Text_Plain_Iptobinary.php:29
 msgid "Converts an Internet network address in (IPv4/IPv6) format to binary"
-msgstr ""
+msgstr "Converte un adresse de rete Internet ab formato (IPv4/IPv6) a binari"
 
 #: libraries/plugins/transformations/input/Text_Plain_JsonEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for JSON."
-msgstr ""
+msgstr "Editor CodeMirror per jSON con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/input/Text_Plain_SqlEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for SQL."
-msgstr ""
+msgstr "Editor CodeMirror per SQL con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/input/Text_Plain_XmlEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for XML (and HTML)."
-msgstr ""
+msgstr "Editor CodeMirror per  XML (e HTML) con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/output/Text_Plain_Binarytoip.php:29
 msgid ""
@@ -10942,11 +10950,11 @@ msgstr ""
 
 #: libraries/plugins/transformations/output/Text_Plain_Json.php:47
 msgid "Formats text as JSON with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como JSON con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/output/Text_Plain_Xml.php:47
 msgid "Formats text as XML with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como XML con evidentia de syntaxe."
 
 #: libraries/pmd_common.php:551
 msgid "Error: relation already exists."
@@ -10963,7 +10971,7 @@ msgstr ""
 
 #: libraries/pmd_common.php:608
 msgid "Error: Missing index on column(s)."
-msgstr ""
+msgstr "Error: Il es mancante le indice sur le campo(s)."
 
 #: libraries/pmd_common.php:613
 msgid "Error: Relational features are disabled!"
@@ -11013,7 +11021,7 @@ msgstr "Configuration de pmadb…"
 
 #: libraries/relation.lib.php:106 libraries/relation.lib.php:142
 msgid "General relation features"
-msgstr ""
+msgstr "Characteristicas general de relation"
 
 #: libraries/relation.lib.php:153
 msgid "Display Features"

From 70c3918a6e71d1c26714594c8be89ec29e27da7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 09:27:31 +0100
Subject: [PATCH 27/63] Remove unused code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/tbl_zoom_plot_jqplot.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 35fdab8934..a99bf6cefe 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -96,19 +96,6 @@ function getType(field) {
         return 'text';
     }
 }
-/**
- ** Converts a categorical array into numeric array
- ** @param array categorical values array
- **/
-function getCord(arr) {
-    var newCord = [];
-    var original = $.extend(true, [], arr);
-    arr = jQuery.unique(arr).sort();
-    $.each(original, function (index, value) {
-        newCord.push(jQuery.inArray(value, arr));
-    });
-    return [newCord, arr, original];
-}
 
 /**
  ** Scrolls the view to the display section

From 9503e0f6aaec8729869b347af1b2cff41e53f1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 09:35:54 +0100
Subject: [PATCH 28/63] Store query data in data attribute instead of HTML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/server_status_queries.js                       | 3 +--
 libraries/server_status_queries.lib.php           | 7 +++----
 test/libraries/PMA_server_status_queries_test.php | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index 7280896a0d..99ac4bbf40 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,10 +16,9 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(JSON.parse($('#serverstatusquerieschart').text()), function (key, value) {
+        $.each(JSON.parse($('#serverstatusquerieschart').data('chart'))), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
-        $('#serverstatusquerieschart').empty();
         $('#serverstatusquerieschart').data(
             'queryPieChart',
             PMA_createProfilingChart(
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index c9fe123d73..270a752940 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -134,13 +134,12 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
     $retval .= '</tbody>';
     $retval .= '</table>';
 
-    $retval .= '<div id="serverstatusquerieschart">';
+    $retval .= '<div id="serverstatusquerieschart" data-chart="';
     if ($other_sum > 0) {
         $chart_json[__('Other')] = $other_sum;
     }
-    $retval .= htmlspecialchars(json_encode($chart_json));
-    $retval .= '</div>';
+    $retval .= htmlspecialchars(json_encode($chart_json), ENT_QUOTES);
+    $retval .= '"></div>';
 
     return $retval;
 }
-
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index 50406c2799..2b443aa914 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -219,7 +219,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
 
         //validate 3:serverstatusquerieschart
         $this->assertContains(
-            '<div id="serverstatusquerieschart">',
+            '<div id="serverstatusquerieschart" data-chart="',
             $html
         );
 

From eafd5a5d9337fa812d70607d053d7bea348cdcb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 09:46:16 +0100
Subject: [PATCH 29/63] Simplify mysqli database connection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- there is no need for _realConnect here as we call just one
  function in all cases (compared to mysql) backend
- properly pass connection flags (see #12898)

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/dbi/DBIMysqli.php | 63 +++++++------------------------------
 1 file changed, 11 insertions(+), 52 deletions(-)

diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index fbc22495ea..e024339602 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -57,55 +57,6 @@ if (! defined('MYSQLI_TYPE_JSON')) {
  */
 class DBIMysqli implements DBIExtension
 {
-    /**
-     * Helper function for connecting to the database server
-     *
-     * @param mysqli $link          connection link
-     * @param string $host          mysql hostname
-     * @param string $user          mysql user name
-     * @param string $password      mysql user password
-     * @param int    $server_port   server port
-     * @param string $server_socket server socket
-     * @param int    $client_flags  client flags of connection
-     * @param bool   $persistent    whether to use persistent connection
-     *
-     * @return bool
-     */
-    private function _realConnect(
-        $link, $host, $user, $password, $server_port,
-        $server_socket, $client_flags = null, $persistent = false
-    ) {
-        global $cfg;
-
-        // mysqli persistent connections
-        if ($cfg['PersistentConnections'] || $persistent) {
-            $host = 'p:' . $host;
-        }
-
-        if ($client_flags === null) {
-            return mysqli_real_connect(
-                $link,
-                $host,
-                $user,
-                $password,
-                '',
-                $server_port,
-                $server_socket
-            );
-        } else {
-            return mysqli_real_connect(
-                $link,
-                $host,
-                $user,
-                $password,
-                '',
-                $server_port,
-                $server_socket,
-                $client_flags
-            );
-        }
-    }
-
     /**
      * connects to the database server
      *
@@ -174,13 +125,21 @@ class DBIMysqli implements DBIExtension
             }
         }
 
-        $return_value = $this->_realConnect(
+        if ($GLOBALS['cfg']['PersistentConnections']) {
+            $host = 'p:' . $server['host'];
+        } else {
+            $host = $server['host'];
+        }
+
+        $return_value = mysqli_real_connect(
             $link,
-            $server['host'],
+            $host,
             $user,
             $password,
+            '',
             $server['port'],
-            $server['socket']
+            $server['socket'],
+            $client_flags
         );
 
         if ($return_value === false || is_null($return_value)) {

From 3bf78afeca5c4965aa1fef66f2bdf34409e2a2da Mon Sep 17 00:00:00 2001
From: Mike Lewis <mike@mplew.is>
Date: Thu, 12 Jan 2017 22:06:25 -0500
Subject: [PATCH 30/63] Only convert table name to lower-case when installation
 forces it

Issue #12861

A `lower_case_table_names` setting of `2` does not mean that the table needs to be forced to lower-case
This preserves case unless the `lower_case_table_names` setting is `1`, implying that lower-case should be forced

Signed-off-by: Mike Lewis <mike@mplew.is>
---
 libraries/Table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Table.php b/libraries/Table.php
index c4fca789a8..7e5792e246 100644
--- a/libraries/Table.php
+++ b/libraries/Table.php
@@ -1350,7 +1350,7 @@ class Table
                 );
             }
         );
-        if ($lowerCaseTableNames) {
+        if ($lowerCaseTableNames === '1') {
             $new_name = strtolower($new_name);
         }
 

From 89357ee0f16b9be36d80d7e5d3d8727923ba2ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 09:58:29 +0100
Subject: [PATCH 31/63] Share code for getting lower_case_table_names value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12861

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Table.php          | 10 +---------
 libraries/operations.lib.php |  5 +----
 test/classes/TableTest.php   |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/libraries/Table.php b/libraries/Table.php
index 7e5792e246..5aae6a7043 100644
--- a/libraries/Table.php
+++ b/libraries/Table.php
@@ -1342,15 +1342,7 @@ class Table
      */
     function rename($new_name, $new_db = null)
     {
-        $lowerCaseTableNames = Util::cacheGet(
-            'lower_case_table_names',
-            function () {
-                return $GLOBALS['dbi']->fetchValue(
-                    "SELECT @@lower_case_table_names"
-                );
-            }
-        );
-        if ($lowerCaseTableNames === '1') {
+        if ($GLOBALS['dbi']->getLowerCaseNames() === '1') {
             $new_name = strtolower($new_name);
         }
 
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 358bd8a2b5..89d6103881 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -353,10 +353,7 @@ function PMA_runProcedureAndFunctionDefinitions($db)
 function PMA_createDbBeforeCopy()
 {
     // lower_case_table_names=1 `DB` becomes `db`
-    $lowerCaseTableNames = $GLOBALS['dbi']->fetchValue(
-        'SELECT @@lower_case_table_names'
-    );
-    if ($lowerCaseTableNames === '1') {
+    if ($GLOBALS['dbi']->getLowerCaseNames() === '1') {
         $_REQUEST['newname'] = mb_strtolower(
             $_REQUEST['newname']
         );
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 760cdefe02..97ed81d4fa 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -751,7 +751,6 @@ class TableTest extends PMATestCase
     {
         $table = 'PMA_BookMark';
         $db = 'PMA';
-        Util::cacheSet('lower_case_table_names', false);
 
         $table = new Table($table, $db);
 

From f1aefb1fa550cebe8f231c4a847c7d4b391524b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 09:59:12 +0100
Subject: [PATCH 32/63] Changelog entry for #12861 and #12891
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 0208f46c72..df7f4a3952 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 - issue #12868 Fix check for user groups freatures being enabled
 - issue #12831 Fix table formatting on Insert tab, which mostly affected row highlighting
 - issue #12495 Reintroduced phpinfo page with limited capabilities
+- issue #12861 Fix renaming tables with lower_case_table_names=2
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

From 9b96ff3b174b121215c226090b5a2ddecc062c90 Mon Sep 17 00:00:00 2001
From: Giovanni Sora <g.sora@tiscali.it>
Date: Tue, 17 Jan 2017 21:58:54 +0000
Subject: [PATCH 33/63] Translated using Weblate (Interlingua)

Currently translated at 75.9% (2447 of 3222 strings)

[CI skip]
---
 po/ia.po | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/po/ia.po b/po/ia.po
index a9e35c086e..de6da31865 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2016-12-21 21:16+0000\n"
+"PO-Revision-Date: 2017-01-17 21:58+0000\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-6/ia/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:38 license.php:33
 #, php-format
@@ -2199,12 +2199,16 @@ msgid ""
 "MySQL accepts additional values not selectable by the slider; key in those "
 "values directly if desired"
 msgstr ""
+"MySQL accepta valores additional non selectionabile per le slider; si tu "
+"vole pote insertar directemente celle valores"
 
 #: js/messages.php:529
 msgid ""
 "MySQL accepts additional values not selectable by the datepicker; key in "
 "those values directly if desired"
 msgstr ""
+"MySQL accepta valores additional non selectionabile per le selector de datas:"
+" si tu vole pote insertar celle valores directemente"
 
 #: js/messages.php:535
 msgid ""
@@ -10429,6 +10433,8 @@ msgid ""
 "Include a timestamp of when databases were created, last updated, and last "
 "checked"
 msgstr ""
+"Include un timestamp (marca de tempore) de quando le base de datos esseva "
+"create, le ultime actualisation e le ultime controlo"
 
 #: libraries/plugins/export/ExportSql.php:171
 msgid "Export metadata"
@@ -10996,7 +11002,7 @@ msgstr "Validation falleva per le catena de ingresso %s."
 
 #: libraries/plugins/transformations/abs/SQLTransformationsPlugin.php:29
 msgid "Formats text as SQL query with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como query de SQL con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php:28
 msgid ""
@@ -11012,6 +11018,8 @@ msgid ""
 "File upload functionality for TEXT columns. It does not have a textarea for "
 "input."
 msgstr ""
+"Functionalitate de incargamento de file per columnas de TEXT. Il non ha un "
+"textarea per le ingresso."
 
 #: libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php:32
 msgid ""
@@ -11029,19 +11037,19 @@ msgstr ""
 
 #: libraries/plugins/transformations/input/Text_Plain_Iptobinary.php:29
 msgid "Converts an Internet network address in (IPv4/IPv6) format to binary"
-msgstr ""
+msgstr "Converte un adresse de rete Internet ab formato (IPv4/IPv6) a binari"
 
 #: libraries/plugins/transformations/input/Text_Plain_JsonEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for JSON."
-msgstr ""
+msgstr "Editor CodeMirror per jSON con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/input/Text_Plain_SqlEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for SQL."
-msgstr ""
+msgstr "Editor CodeMirror per SQL con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/input/Text_Plain_XmlEditor.php:29
 msgid "Syntax highlighted CodeMirror editor for XML (and HTML)."
-msgstr ""
+msgstr "Editor CodeMirror per  XML (e HTML) con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/output/Text_Plain_Binarytoip.php:29
 msgid ""
@@ -11051,11 +11059,11 @@ msgstr ""
 
 #: libraries/plugins/transformations/output/Text_Plain_Json.php:47
 msgid "Formats text as JSON with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como JSON con evidentia de syntaxe."
 
 #: libraries/plugins/transformations/output/Text_Plain_Xml.php:47
 msgid "Formats text as XML with syntax highlighting."
-msgstr ""
+msgstr "Formata texto como XML con evidentia de syntaxe."
 
 #: libraries/pmd_common.php:549
 msgid "Error: relation already exists."
@@ -11072,7 +11080,7 @@ msgstr ""
 
 #: libraries/pmd_common.php:606
 msgid "Error: Missing index on column(s)."
-msgstr ""
+msgstr "Error: Il es mancante le indice sur le campo(s)."
 
 #: libraries/pmd_common.php:611
 msgid "Error: Relational features are disabled!"
@@ -11122,7 +11130,7 @@ msgstr "Configuration de pmadb…"
 
 #: libraries/relation.lib.php:105 libraries/relation.lib.php:141
 msgid "General relation features"
-msgstr ""
+msgstr "Characteristicas general de relation"
 
 #: libraries/relation.lib.php:152
 msgid "Display Features"

From ce9f84e477fd53db65df40b33fa2d558b3a4aeed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 16:05:32 +0100
Subject: [PATCH 34/63] Use shared mock for response without any header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/PMATestCase.php                          | 18 ++++++++-------
 .../core/PMA_headerLocation_test.php          | 23 ++-----------------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/test/PMATestCase.php b/test/PMATestCase.php
index 418a635f47..e949457a7f 100644
--- a/test/PMATestCase.php
+++ b/test/PMATestCase.php
@@ -43,15 +43,17 @@ class PMATestCase extends PHPUnit_Framework_TestCase
 
         $param = func_get_args();
 
-        if (is_array($param[0])) {
-            $header_method = $mockResponse->expects($this->exactly(count($param)))
-                ->method('header');
+        if (count($param) > 0) {
+            if (is_array($param[0])) {
+                $header_method = $mockResponse->expects($this->exactly(count($param)))
+                    ->method('header');
 
-            call_user_func_array(array($header_method, 'withConsecutive'), $param);
-        } else {
-            $mockResponse->expects($this->once())
-                ->method('header')
-                ->with($param[0]);
+                call_user_func_array(array($header_method, 'withConsecutive'), $param);
+            } else {
+                $mockResponse->expects($this->once())
+                    ->method('header')
+                    ->with($param[0]);
+            }
         }
 
         $this->attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 18864415a1..046acc1c06 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -126,27 +126,8 @@ class PMA_HeaderLocation_Test extends PMATestCase
 
         $this->expectOutputString($header);
 
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('disable', 'header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('disable');
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
+        $this->mockResponse();
 
         PMA_sendHeaderLocation($testUri);
-
-        $attrInstance->setValue($restoreInstance);
     }
-}
\ No newline at end of file
+}

From 028f32da5f7f4f0ba1680f23e548e09ad2079672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 16:14:25 +0100
Subject: [PATCH 35/63] Share more code for reponse mocking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/PMATestCase.php                          |  8 ++++-
 .../plugin/auth/AuthenticationCookieTest.php  | 35 ++-----------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/test/PMATestCase.php b/test/PMATestCase.php
index e949457a7f..08e85b777f 100644
--- a/test/PMATestCase.php
+++ b/test/PMATestCase.php
@@ -33,7 +33,11 @@ class PMATestCase extends PHPUnit_Framework_TestCase
 
         $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array('header', 'headersSent', 'disable', 'isAjax'))
+            ->setMethods(array(
+                'header', 'headersSent', 'disable', 'isAjax',
+                'setRequestStatus', 'addJSON',
+                'getFooter', 'getHeader',
+            ))
             ->getMock();
 
         $mockResponse->expects($this->any())
@@ -59,6 +63,8 @@ class PMATestCase extends PHPUnit_Framework_TestCase
         $this->attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
         $this->attrInstance->setAccessible(true);
         $this->attrInstance->setValue($mockResponse);
+
+        return $mockResponse;
     }
 
     /**
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index a5ad0f4558..4ebc79a509 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -64,12 +64,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     public function testAuthErrorAJAX()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'setRequestStatus', 'addJSON'))
-            ->getMock();
+        $mockResponse = $this->mockResponse();
 
         $mockResponse->expects($this->once())
             ->method('isAjax')
@@ -87,15 +82,10 @@ class AuthenticationCookieTest extends PMATestCase
                 '1'
             );
 
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
         $GLOBALS['conn_error'] = true;
         $this->assertTrue(
             $this->object->auth()
         );
-
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**
@@ -106,11 +96,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     public function testAuthError()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
-            ->getMock();
+        $mockResponse = $this->mockResponse();
 
         $mockResponse->expects($this->once())
             ->method('isAjax')
@@ -175,10 +161,6 @@ class AuthenticationCookieTest extends PMATestCase
             ->with()
             ->will($this->returnValue($mockHeader));
 
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
         $GLOBALS['pmaThemeImage'] = 'test';
         $GLOBALS['conn_error'] = true;
         $GLOBALS['cfg']['Lang'] = 'en';
@@ -273,7 +255,6 @@ class AuthenticationCookieTest extends PMATestCase
         );
 
         @unlink('testlogo_right.png');
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**
@@ -284,11 +265,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     public function testAuthCaptcha()
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
-            ->getMock();
+        $mockResponse = $this->mockResponse();
 
         $mockResponse->expects($this->once())
             ->method('isAjax')
@@ -308,10 +285,6 @@ class AuthenticationCookieTest extends PMATestCase
         $_REQUEST['old_usr'] = '';
         $GLOBALS['cfg']['LoginCookieRecall'] = false;
 
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
         $GLOBALS['pmaThemeImage'] = 'test';
         $GLOBALS['cfg']['Lang'] = '';
         $GLOBALS['cfg']['AllowArbitraryServer'] = false;
@@ -360,8 +333,6 @@ class AuthenticationCookieTest extends PMATestCase
             '<div class="g-recaptcha" data-sitekey="testpubkey">',
             $result
         );
-
-        $attrInstance->setValue($restoreInstance);
     }
 
     /**

From 815149c3f903014959aa932917e901e57802a23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 16:32:19 +0100
Subject: [PATCH 36/63] Share more of response mocking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/PMATestCase.php                          |  5 ++-
 .../plugin/auth/AuthenticationHttpTest.php    | 41 ++++---------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/test/PMATestCase.php b/test/PMATestCase.php
index 08e85b777f..68b2644108 100644
--- a/test/PMATestCase.php
+++ b/test/PMATestCase.php
@@ -35,7 +35,7 @@ class PMATestCase extends PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->setMethods(array(
                 'header', 'headersSent', 'disable', 'isAjax',
-                'setRequestStatus', 'addJSON',
+                'setRequestStatus', 'addJSON', 'addHTML',
                 'getFooter', 'getHeader',
             ))
             ->getMock();
@@ -49,6 +49,9 @@ class PMATestCase extends PHPUnit_Framework_TestCase
 
         if (count($param) > 0) {
             if (is_array($param[0])) {
+                if (is_array($param[0][0]) && count($param) == 1) {
+                    $param = $param[0];
+                }
                 $header_method = $mockResponse->expects($this->exactly(count($param)))
                     ->method('header');
 
diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/plugin/auth/AuthenticationHttpTest.php
index 54d08c270e..b7fb101f10 100644
--- a/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ b/test/classes/plugin/auth/AuthenticationHttpTest.php
@@ -47,13 +47,12 @@ class AuthenticationHttpTest extends PMATestCase
      */
     public function tearDown()
     {
+        parent::tearDown();
         unset($this->object);
     }
 
     public function doMockResponse($set_minimal, $body_id, $set_title)
     {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
         // mock footer
         $mockFooter = $this->getMockBuilder('PMA\libraries\Footer')
             ->disableOriginalConstructor()
@@ -86,10 +85,8 @@ class AuthenticationHttpTest extends PMATestCase
             ->with();
 
         // set mocked headers and footers
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('getHeader', 'getFooter', 'addHTML', 'header', 'headersSent'))
-            ->getMock();
+        $headers = array_slice(func_get_args(), 3);
+        $mockResponse = $this->mockResponse($headers);
 
         $mockResponse->expects($this->exactly($set_title))
             ->method('getFooter')
@@ -101,36 +98,16 @@ class AuthenticationHttpTest extends PMATestCase
             ->with()
             ->will($this->returnValue($mockHeader));
 
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
         $mockResponse->expects($this->exactly($set_title * 7))
             ->method('addHTML')
             ->with();
 
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $headers = array_slice(func_get_args(), 3);
-
-        $header_method = $mockResponse->expects($this->exactly(count($headers)))
-            ->method('header');
-
-        call_user_func_array(array($header_method, 'withConsecutive'), $headers);
-
-        try {
-            if (!empty($_REQUEST['old_usr'])) {
-                $this->object->logOut();
-            } else {
-                $this->assertFalse(
-                    $this->object->auth()
-                );
-            }
-        } finally {
-            $attrInstance->setValue($restoreInstance);
+        if (!empty($_REQUEST['old_usr'])) {
+            $this->object->logOut();
+        } else {
+            $this->assertFalse(
+                $this->object->auth()
+            );
         }
     }
 

From 09d69e9f05b45109e08eacc404e84bdda19821fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 16:42:30 +0100
Subject: [PATCH 37/63] Changelog entry for #12834 and #12896
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 791f5a0db5..e506536309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog
 - issue #12863 Can't toggle Event Scheduler on
 - issue #12742 Finish removing dead code references to xls/xlsx import and export, which was removed some time ago.
 - issue #12536 Rename "Relations" to "Relationships" in many places as it's the more proper term
+- issue #12834 Fixed margins in central columns feature
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

From 930086f4382dbec268461a5528b9e49b7ae96272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 17:20:33 +0100
Subject: [PATCH 38/63] Document more export configuration options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12903

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog      |  1 +
 doc/config.rst | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e506536309..d20d5e7b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog
 - issue #12742 Finish removing dead code references to xls/xlsx import and export, which was removed some time ago.
 - issue #12536 Rename "Relations" to "Relationships" in many places as it's the more proper term
 - issue #12834 Fixed margins in central columns feature
+- issue #12903 Document more export configuration options
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/doc/config.rst b/doc/config.rst
index 36b727a289..ad72a8192b 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -2315,6 +2315,13 @@ Export and import settings
     items are similar to texts seen on export page, so you can easily
     identify what they mean.
 
+.. config:option:: $cfg['Export']['format']
+   
+    :type: string
+    :default: ``'sql'``
+
+    Default export format.
+
 .. config:option:: $cfg['Export']['method']
 
     :type: string
@@ -2336,6 +2343,33 @@ Export and import settings
     Defines charset for generated export. By default no charset conversion is
     done assuming UTF-8.
 
+.. config:option:: $cfg['Export']['file_template_table']
+
+    :type: string
+    :default: ``'@TABLE@'``
+
+    Default filename template for table exports.
+
+    .. seealso:: :ref:`faq6_27`
+
+.. config:option:: $cfg['Export']['file_template_database']
+
+    :type: string
+    :default: ``'@DATABASE@'``
+
+    Default filename template for database exports.
+
+    .. seealso:: :ref:`faq6_27`
+
+.. config:option:: $cfg['Export']['file_template_server']
+
+    :type: string
+    :default: ``'@SERVER@'``
+
+    Default filename template for server exports.
+
+    .. seealso:: :ref:`faq6_27`
+
 .. config:option:: $cfg['Import']
 
     :type: array

From 71575e3d49ed57dc701b5ea2d04bbb3de19c2729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 18 Jan 2017 18:05:46 +0100
Subject: [PATCH 39/63] Changelog entry for #12876 and #12885
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 686497b480..79ea5218cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
 - issue #12831 Fix table formatting on Insert tab, which mostly affected row highlighting
 - issue #12495 Reintroduced phpinfo page with limited capabilities
 - issue #12861 Fix renaming tables with lower_case_table_names=2
+- issue #12876 Fix possible PHP error in navigation
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

From 206a59007a085bae7a7c1440a104d2f8a68e2087 Mon Sep 17 00:00:00 2001
From: Flavio Coelho <flavio.coelho.mail@gmail.com>
Date: Thu, 19 Jan 2017 21:38:39 +0000
Subject: [PATCH 40/63] Translated using Weblate (Portuguese)

Currently translated at 54.0% (1740 of 3222 strings)

[CI skip]
---
 po/pt.po | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 8992f878a2..7ae5dff7de 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2017-01-16 01:58+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
+"PO-Revision-Date: 2017-01-19 21:38+0000\n"
+"Last-Translator: Flavio Coelho <flavio.coelho.mail@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-6/pt/>\n"
 "Language: pt\n"
@@ -1209,8 +1209,6 @@ msgid "Used memory"
 msgstr "Memória utilizada"
 
 #: js/messages.php:186
-#, fuzzy
-#| msgid "Total Swap"
 msgid "Total swap"
 msgstr "Swap total"
 
@@ -1730,8 +1728,6 @@ msgid "Processing request"
 msgstr "Processando Pedido"
 
 #: js/messages.php:355
-#, fuzzy
-#| msgid "Request Aborted!!"
 msgid "Request failed!!"
 msgstr "Pedido falhou!!"
 

From 728fc18c2b9addf0103e0ab09ff68739ebeaf8b7 Mon Sep 17 00:00:00 2001
From: Flavio Coelho <flavio.coelho.mail@gmail.com>
Date: Thu, 19 Jan 2017 21:38:36 +0000
Subject: [PATCH 41/63] Translated using Weblate (Portuguese)

Currently translated at 53.6% (1737 of 3239 strings)

[CI skip]
---
 po/pt.po | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 5734c1352a..5683969578 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2017-01-16 01:58+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
+"PO-Revision-Date: 2017-01-19 21:38+0000\n"
+"Last-Translator: Flavio Coelho <flavio.coelho.mail@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/pt/>\n"
 "Language: pt\n"
@@ -746,24 +746,17 @@ msgstr ""
 "verificação de versão estão desativadas."
 
 #: index.php:474
-#, fuzzy
-#| msgid ""
-#| "Your PHP parameter [a@https://secure.php.net/manual/en/session."
-#| "configuration.php#ini.session.gc-maxlifetime@_blank]session."
-#| "gc_maxlifetime[/a] is lower than cookie validity configured in "
-#| "phpMyAdmin, because of this, your login will expire sooner than "
-#| "configured in phpMyAdmin."
 msgid ""
 "Your PHP parameter [a@https://secure.php.net/manual/en/session.configuration."
 "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower "
 "than cookie validity configured in phpMyAdmin, because of this, your login "
 "might expire sooner than configured in phpMyAdmin."
 msgstr ""
-"O seu parâmetro PHP [a@https://secure.php.net/manual/en/session."
-"configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/"
-"a] é menor que o valor válido para o cookie configurado no phpMyAdmin, e por "
-"isso, a sua autenticação poderá expirar mais cedo que o configurado no "
-"phpMyAdmin."
+"O seu parâmetro PHP "
+"[a@https://secure.php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime@_blank]session.gc_maxlifetime[/a] é menor que o valor válido "
+"para o cookie configurado no phpMyAdmin, e por isso, a sua autenticação "
+"poderá expirar mais cedo que o configurado no phpMyAdmin."
 
 #: index.php:493
 msgid ""
@@ -1204,8 +1197,6 @@ msgid "Used memory"
 msgstr "Memória utilizada"
 
 #: js/messages.php:191
-#, fuzzy
-#| msgid "Total Swap"
 msgid "Total swap"
 msgstr "Swap total"
 
@@ -1726,8 +1717,6 @@ msgid "Processing request"
 msgstr "Processando Pedido"
 
 #: js/messages.php:360
-#, fuzzy
-#| msgid "Request Aborted!!"
 msgid "Request failed!!"
 msgstr "Pedido falhou!!"
 

From 8a805fde91c18d1a53a6a6ab7791218735585eb1 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 19 Jan 2017 22:38:35 -0500
Subject: [PATCH 42/63] Be more direct about syslog documentation

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 doc/setup.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/setup.rst b/doc/setup.rst
index 0d204aa1d4..7ac546ed51 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -936,8 +936,9 @@ are always ways to make your installation more secure:
 * If you are afraid of automated attacks, enabling Captcha by
   :config:option:`$cfg['CaptchaLoginPublicKey']` and
   :config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.
-* Alternative approach might be using fail2ban as phpMyAdmin logs failed
-  authentication attempts to syslog (if available)
+* Failed login attemps are logged to syslog (if available). This can allow using a tool such as
+  fail2ban to block brute-force attempts. Note that the log file used by syslog is not the same
+  as the Apache error or access log files.
 
 Known issues
 ++++++++++++

From 756c6552c275d66adbbf3a60c934e5678bc78495 Mon Sep 17 00:00:00 2001
From: Shreyas Sinha <shreyas.sinha14@gmail.com>
Date: Fri, 20 Jan 2017 11:17:03 +0530
Subject: [PATCH 43/63] Using CreateElement for adding HTML

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
---
 js/functions.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 81f5fbfa19..986bff6559 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -521,10 +521,15 @@ function PMA_current_version(data)
         var current = parseVersionString($('span.version').text());
         var latest = parseVersionString(data.version);
         var url = 'https://web.phpmyadmin.net/files/' + escapeHtml(encodeURIComponent(data.version)) + '/';
-        var version_information_message = '<span class="latest">' +
-            PMA_messages.strLatestAvailable +
-            ' <a href="' + url + '" class="disableAjax">' + escapeHtml(data.version) + '</a>' +
-            '</span>';
+        var version_information_message = document.createElement('span');
+        version_information_message.class = 'latest';
+        var version_information_message_link = document.createElement('a');
+        version_information_message_link.href = url;
+        version_information_message_link.class = 'disableAjax';
+        version_information_message_link.innerHTML = escapeHtml(data.version);
+        var prefix_message = document.createTextNode(PMA_messages.strLatestAvailable);
+        version_information_message.appendChild(prefix_message);
+        version_information_message.appendChild(version_information_message_link);
         if (latest > current) {
             var message = PMA_sprintf(
                 PMA_messages.strNewerVersion,
@@ -537,14 +542,22 @@ function PMA_current_version(data)
                 htmlClass = 'error';
             }
             $('#newer_version_notice').remove();
-            $('#maincontainer').after('<div id="newer_version_notice" class="' + htmlClass + '"><a href="' + url + '" class="disableAjax">' + message + '</a></div>');
+            var maincontainer_div = document.createElement('div');
+            maincontainer_div.id = 'newer_version_notice';
+            maincontainer_div.class = htmlClass;
+            var maincontainer_div_link = document.createElement('a');
+            maincontainer_div_link.href = url;
+            maincontainer_div_link.class = "disableAjax";
+            maincontainer_div_link.innerHTML = message;
+            maincontainer_div.appendChild(maincontainer_div_link);
+            document.getElementById("maincontainer").appendChild(maincontainer_div);
         }
         if (latest === current) {
-            version_information_message = ' (' + PMA_messages.strUpToDate + ')';
+            version_information_message = document.createTextNode(' (' + PMA_messages.strUpToDate + ')');
         }
         var $liPmaVersion = $('#li_pma_version');
         $liPmaVersion.find('span.latest').remove();
-        $liPmaVersion.append(version_information_message);
+        document.getElementById("li_pma_version").appendChild(version_information_message);
     }
 }
 

From 827ff5715a4fe8e2d8eee37ad2f759c4f551e5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 13:19:24 +0100
Subject: [PATCH 44/63] Fix database search with newer php-gettext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We really need integer from count query.

Fixes #12881

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog              | 1 +
 libraries/DbSearch.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8e07571433..1c1b50034b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog
 - issue #12495 Reintroduced phpinfo page with limited capabilities
 - issue #12861 Fix renaming tables with lower_case_table_names=2
 - issue #12876 Fix possible PHP error in navigation
+- issue #12881 Fix database search with newer php-gettext
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/libraries/DbSearch.php b/libraries/DbSearch.php
index ad2b73fee8..4d0c1eab81 100644
--- a/libraries/DbSearch.php
+++ b/libraries/DbSearch.php
@@ -275,7 +275,7 @@ class DbSearch
             // Gets the SQL statements
             $newsearchsqls = $this->_getSearchSqls($each_table);
             // Executes the "COUNT" statement
-            $res_cnt = $GLOBALS['dbi']->fetchValue($newsearchsqls['select_count']);
+            $res_cnt = intval($GLOBALS['dbi']->fetchValue($newsearchsqls['select_count']));
             $num_search_result_total += $res_cnt;
             // Gets the result row's HTML for a table
             $html_output .= $this->_getResultsRow(

From 1d732ed4b069cea551232953f87aad0ee0e7ea0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 13:35:56 +0100
Subject: [PATCH 45/63] Use consistent numeric format for table overhead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using 4 digits is not really consistent with rest of the UI.

Basically this reverts 0f74231.

Fixes #12897

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                                     | 1 +
 .../controllers/database/DatabaseStructureController.php      | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 855ac655d3..5a4fea6432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
 - issue #12536 Rename "Relations" to "Relationships" in many places as it's the more proper term
 - issue #12834 Fixed margins in central columns feature
 - issue #12903 Document more export configuration options
+- issue #12897 Use consistent numeric format for table overhead
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 996db1ed22..5439bde969 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -1036,11 +1036,9 @@ class DatabaseStructureController extends DatabaseController
             if (isset($current_table['Data_free'])
                 && $current_table['Data_free'] > 0
             ) {
-                // here, the value 4 as the second parameter
-                // would transform 6.1MiB into 6,224.6KiB
                 list($formatted_overhead, $overhead_unit)
                     = Util::formatByteDown(
-                        $current_table['Data_free'], 4,
+                        $current_table['Data_free'], 3,
                         (($current_table['Data_free'] > 0) ? 1 : 0)
                     );
                 $overhead_size += $current_table['Data_free'];

From e7928e58ccf1f8e1fa82110a0bb03b5764b61198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 14:05:10 +0100
Subject: [PATCH 46/63] Update SQL parser to 3.4.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12894

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                    |   1 +
 libraries/sql-parser/src/Lexer.php           | 156 +++++++++++--------
 libraries/sql-parser/src/Utils/Formatter.php | 130 +++++++---------
 3 files changed, 146 insertions(+), 141 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c1b50034b..8857dd820b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ phpMyAdmin - ChangeLog
 - issue #12861 Fix renaming tables with lower_case_table_names=2
 - issue #12876 Fix possible PHP error in navigation
 - issue #12881 Fix database search with newer php-gettext
+- issue #12894 Fix linter error on unterminated variable name
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php
index 73c4100a84..8222013a54 100644
--- a/libraries/sql-parser/src/Lexer.php
+++ b/libraries/sql-parser/src/Lexer.php
@@ -185,18 +185,16 @@ class Lexer
     {
         // `strlen` is used instead of `mb_strlen` because the lexer needs to
         // parse each byte of the input.
-        $len = ($str instanceof UtfString) ? $str->length() : strlen($str);
+        $len = $str instanceof UtfString ? $str->length() : strlen($str);
 
         // For multi-byte strings, a new instance of `UtfString` is
         // initialized (only if `UtfString` usage is forced.
-        if (!($str instanceof UtfString)) {
-            if ((USE_UTF_STRINGS) && ($len !== mb_strlen($str, 'UTF-8'))) {
-                $str = new UtfString($str);
-            }
+        if (!$str instanceof UtfString && USE_UTF_STRINGS && $len !== mb_strlen($str, 'UTF-8')) {
+            $str = new UtfString($str);
         }
 
         $this->str = $str;
-        $this->len = ($str instanceof UtfString) ? $str->length() : $len;
+        $this->len = $str instanceof UtfString ? $str->length() : $len;
 
         $this->strict = $strict;
 
@@ -251,7 +249,7 @@ class Lexer
             $token = null;
 
             foreach (static::$PARSER_METHODS as $method) {
-                if (($token = $this->$method())) {
+                if ($token = $this->$method()) {
                     break;
                 }
             }
@@ -264,12 +262,16 @@ class Lexer
                     $this->str[$this->last],
                     $this->last
                 );
-            } elseif (($lastToken !== null)
-                && ($token->type === Token::TYPE_SYMBOL)
-                && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)
-                && (($lastToken->type === Token::TYPE_STRING)
-                || (($lastToken->type === Token::TYPE_SYMBOL)
-                && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)))
+            } elseif ($lastToken !== null
+                && $token->type === Token::TYPE_SYMBOL
+                && $token->flags & Token::FLAG_SYMBOL_VARIABLE
+                && (
+                    $lastToken->type === Token::TYPE_STRING
+                    || (
+                        $lastToken->type === Token::TYPE_SYMBOL
+                        && $lastToken->flags & Token::FLAG_SYMBOL_BACKTICK
+                    )
+                )
             ) {
                 // Handles ```... FROM 'user'@'%' ...```.
                 $lastToken->token .= $token->token;
@@ -277,10 +279,10 @@ class Lexer
                 $lastToken->flags = Token::FLAG_SYMBOL_USER;
                 $lastToken->value .= '@' . $token->value;
                 continue;
-            } elseif (($lastToken !== null)
-                && ($token->type === Token::TYPE_KEYWORD)
-                && ($lastToken->type === Token::TYPE_OPERATOR)
-                && ($lastToken->value === '.')
+            } elseif ($lastToken !== null
+                && $token->type === Token::TYPE_KEYWORD
+                && $lastToken->type === Token::TYPE_OPERATOR
+                && $lastToken->value === '.'
             ) {
                 // Handles ```... tbl.FROM ...```. In this case, FROM is not
                 // a reserved word.
@@ -294,7 +296,7 @@ class Lexer
             $list->tokens[$list->count++] = $token;
 
             // Handling delimiters.
-            if (($token->type === Token::TYPE_NONE) && ($token->value === 'DELIMITER')) {
+            if ($token->type === Token::TYPE_NONE && $token->value === 'DELIMITER') {
                 if ($this->last + 1 >= $this->len) {
                     $this->error(
                         __('Expected whitespace(s) before delimiter.'),
@@ -325,7 +327,7 @@ class Lexer
 
                 // Parsing the delimiter.
                 $this->delimiter = null;
-                while ((++$this->last < $this->len) && (!Context::isWhitespace($this->str[$this->last]))) {
+                while (++$this->last < $this->len && !Context::isWhitespace($this->str[$this->last])) {
                     $this->delimiter .= $this->str[$this->last];
                 }
 
@@ -419,16 +421,17 @@ class Lexer
             } else {
                 $lastSpace = false;
             }
-            $token .= $this->str[$this->last];
-            if (($this->last + 1 === $this->len) || (Context::isSeparator($this->str[$this->last + 1]))) {
-                if (($flags = Context::isKeyword($token))) {
-                    $ret = new Token($token, Token::TYPE_KEYWORD, $flags);
-                    $iEnd = $this->last;
 
-                    // We don't break so we find longest keyword.
-                    // For example, `OR` and `ORDER` have a common prefix `OR`.
-                    // If we stopped at `OR`, the parsing would be invalid.
-                }
+            $token .= $this->str[$this->last];
+            if (($this->last + 1 === $this->len || Context::isSeparator($this->str[$this->last + 1]))
+                && $flags = Context::isKeyword($token)
+            ) {
+                $ret = new Token($token, Token::TYPE_KEYWORD, $flags);
+                $iEnd = $this->last;
+
+                // We don't break so we find longest keyword.
+                // For example, `OR` and `ORDER` have a common prefix `OR`.
+                // If we stopped at `OR`, the parsing would be invalid.
             }
         }
 
@@ -542,7 +545,7 @@ class Lexer
             return null;
         }
 
-        while ((++$this->last < $this->len) && (Context::isWhitespace($this->str[$this->last]))) {
+        while (++$this->last < $this->len && Context::isWhitespace($this->str[$this->last])) {
             $token .= $this->str[$this->last];
         }
 
@@ -563,10 +566,12 @@ class Lexer
 
         // Bash style comments. (#comment\n)
         if (Context::isComment($token)) {
-            while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
+            while (
+                ++$this->last < $this->len
+                && $this->str[$this->last] !== "\n"
+            ) {
                 $token .= $this->str[$this->last];
             }
-            $token .= "\n"; // Adding the line ending.
             return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH);
         }
 
@@ -583,13 +588,16 @@ class Lexer
                 }
 
                 // Checking if this is a MySQL-specific command.
-                if (($this->last + 1 < $this->len) && ($this->str[$this->last + 1] === '!')) {
+                if ($this->last + 1 < $this->len
+                    && $this->str[$this->last + 1] === '!'
+                ) {
                     $flags |= Token::FLAG_COMMENT_MYSQL_CMD;
                     $token .= $this->str[++$this->last];
 
-                    while ((++$this->last < $this->len)
-                        && ('0' <= $this->str[$this->last])
-                        && ($this->str[$this->last] <= '9')
+                    while (
+                        ++$this->last < $this->len
+                        && '0' <= $this->str[$this->last]
+                        && $this->str[$this->last] <= '9'
                     ) {
                         $token .= $this->str[$this->last];
                     }
@@ -601,8 +609,12 @@ class Lexer
                 }
 
                 // Parsing the comment.
-                while ((++$this->last < $this->len)
-                    && (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))
+                while (
+                    ++$this->last < $this->len
+                    && (
+                        $this->str[$this->last - 1] !== '*'
+                        || $this->str[$this->last] !== '/'
+                    )
                 ) {
                     $token .= $this->str[$this->last];
                 }
@@ -622,10 +634,12 @@ class Lexer
             if (Context::isComment($token)) {
                 // Checking if this comment did not end already (```--\n```).
                 if ($this->str[$this->last] !== "\n") {
-                    while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
+                    while (
+                        ++$this->last < $this->len
+                        && $this->str[$this->last] !== "\n"
+                    ) {
                         $token .= $this->str[$this->last];
                     }
-                    $token .= "\n"; // Adding the line ending.
                 }
 
                 return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_SQL);
@@ -719,14 +733,16 @@ class Lexer
             if ($state === 1) {
                 if ($this->str[$this->last] === '-') {
                     $flags |= Token::FLAG_NUMBER_NEGATIVE;
-                } elseif (($this->last + 1 < $this->len)
-                    && ($this->str[$this->last] === '0')
-                    && (($this->str[$this->last + 1] === 'x')
-                    || ($this->str[$this->last + 1] === 'X'))
+                } elseif ($this->last + 1 < $this->len
+                    && $this->str[$this->last] === '0'
+                    && (
+                        $this->str[$this->last + 1] === 'x'
+                        || $this->str[$this->last + 1] === 'X'
+                    )
                 ) {
                     $token .= $this->str[$this->last++];
                     $state = 2;
-                } elseif (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) {
+                } elseif ($this->str[$this->last] >= '0' && $this->str[$this->last] <= '9') {
                     $state = 3;
                 } elseif ($this->str[$this->last] === '.') {
                     $state = 4;
@@ -738,40 +754,43 @@ class Lexer
                 }
             } elseif ($state === 2) {
                 $flags |= Token::FLAG_NUMBER_HEX;
-                if (!((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9'))
-                    || (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F'))
-                    || (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f')))
+                if (
+                    !(
+                        ($this->str[$this->last] >= '0' && $this->str[$this->last] <= '9')
+                        || ($this->str[$this->last] >= 'A' && $this->str[$this->last] <= 'F')
+                        || ($this->str[$this->last] >= 'a' && $this->str[$this->last] <= 'f')
+                    )
                 ) {
                     break;
                 }
             } elseif ($state === 3) {
                 if ($this->str[$this->last] === '.') {
                     $state = 4;
-                } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) {
+                } elseif ($this->str[$this->last] === 'e' || $this->str[$this->last] === 'E') {
                     $state = 5;
-                } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
+                } elseif ($this->str[$this->last] < '0' || $this->str[$this->last] > '9') {
                     // Just digits and `.`, `e` and `E` are valid characters.
                     break;
                 }
             } elseif ($state === 4) {
                 $flags |= Token::FLAG_NUMBER_FLOAT;
-                if (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) {
+                if ($this->str[$this->last] === 'e' || $this->str[$this->last] === 'E') {
                     $state = 5;
-                } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
+                } elseif ($this->str[$this->last] < '0' || $this->str[$this->last] > '9') {
                     // Just digits, `e` and `E` are valid characters.
                     break;
                 }
             } elseif ($state === 5) {
                 $flags |= Token::FLAG_NUMBER_APPROXIMATE;
-                if (($this->str[$this->last] === '+') || ($this->str[$this->last] === '-')
-                    || ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')))
+                if ($this->str[$this->last] === '+' || $this->str[$this->last] === '-'
+                    || ($this->str[$this->last] >= '0' && $this->str[$this->last] <= '9')
                 ) {
                     $state = 6;
                 } else {
                     break;
                 }
             } elseif ($state === 6) {
-                if (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
+                if ($this->str[$this->last] < '0' || $this->str[$this->last] > '9') {
                     // Just digits are valid characters.
                     break;
                 }
@@ -785,8 +804,8 @@ class Lexer
             } elseif ($state === 8) {
                 if ($this->str[$this->last] === '\'') {
                     $state = 9;
-                } elseif (($this->str[$this->last] !== '0')
-                    && ($this->str[$this->last] !== '1')
+                } elseif ($this->str[$this->last] !== '0'
+                    && $this->str[$this->last] !== '1'
                 ) {
                     break;
                 }
@@ -795,9 +814,9 @@ class Lexer
             }
             $token .= $this->str[$this->last];
         }
-        if (($state === 2) || ($state === 3)
-            || (($token !== '.') && ($state === 4))
-            || ($state === 6) || ($state === 9)
+        if ($state === 2 || $state === 3
+            || ($token !== '.' && $state === 4)
+            || $state === 6 || $state === 9
         ) {
             --$this->last;
 
@@ -818,15 +837,17 @@ class Lexer
     public function parseString($quote = '')
     {
         $token = $this->str[$this->last];
-        if ((!($flags = Context::isString($token))) && ($token !== $quote)) {
+        if (!($flags = Context::isString($token)) && $token !== $quote) {
             return null;
         }
         $quote = $token;
 
         while (++$this->last < $this->len) {
-            if (($this->last + 1 < $this->len)
-                && ((($this->str[$this->last] === $quote) && ($this->str[$this->last + 1] === $quote))
-                || (($this->str[$this->last] === '\\') && ($quote !== '`')))
+            if ($this->last + 1 < $this->len
+                && (
+                    ($this->str[$this->last] === $quote && $this->str[$this->last + 1] === $quote)
+                    || ($this->str[$this->last] === '\\' && $quote !== '`')
+                )
             ) {
                 $token .= $this->str[$this->last] . $this->str[++$this->last];
             } else {
@@ -837,7 +858,7 @@ class Lexer
             }
         }
 
-        if (($this->last >= $this->len) || ($this->str[$this->last] !== $quote)) {
+        if ($this->last >= $this->len || $this->str[$this->last] !== $quote) {
             $this->error(
                 sprintf(
                     __('Ending quote %1$s was expected.'),
@@ -866,7 +887,7 @@ class Lexer
         }
 
         if ($flags & Token::FLAG_SYMBOL_VARIABLE) {
-            if ($this->str[++$this->last] === '@') {
+            if ($this->last + 1 < $this->len && $this->str[++$this->last] === '@') {
                 // This is a system variable (e.g. `@@hostname`).
                 $token .= $this->str[$this->last++];
                 $flags |= Token::FLAG_SYMBOL_SYSTEM;
@@ -907,7 +928,8 @@ class Lexer
         if (Context::isSeparator($token)) {
             return null;
         }
-        while ((++$this->last < $this->len) && (!Context::isSeparator($this->str[$this->last]))) {
+
+        while (++$this->last < $this->len && !Context::isSeparator($this->str[$this->last])) {
             $token .= $this->str[$this->last];
         }
         --$this->last;
@@ -924,7 +946,7 @@ class Lexer
     {
         $idx = 0;
 
-        while (($idx < $this->delimiterLen) && ($this->last + $idx < $this->len)) {
+        while ($idx < $this->delimiterLen && $this->last + $idx < $this->len) {
             if ($this->delimiter[$idx] !== $this->str[$this->last + $idx]) {
                 return null;
             }
diff --git a/libraries/sql-parser/src/Utils/Formatter.php b/libraries/sql-parser/src/Utils/Formatter.php
index ec23ba9d98..b488a6a67a 100644
--- a/libraries/sql-parser/src/Utils/Formatter.php
+++ b/libraries/sql-parser/src/Utils/Formatter.php
@@ -78,6 +78,10 @@ class Formatter
             $options['line_ending'] = $options['type'] === 'html' ? '<br/>' : "\n";
         }
 
+        if (is_null($options['indentation'])) {
+            $options['indentation'] = $options['type'] === 'html' ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '    ';
+        }
+
         // `parts_newline` requires `clause_newline`
         $options['parts_newline'] &= $options['clause_newline'];
 
@@ -112,7 +116,7 @@ class Formatter
              *
              * @var string
              */
-            'indentation' => '  ',
+            'indentation' => null,
 
             /*
              * Whether comments should be removed or not.
@@ -322,14 +326,6 @@ class Formatter
          */
         $prev = null;
 
-        /**
-         * Comments are being formatted separately to maintain the whitespaces
-         * before and after them.
-         *
-         * @var string
-         */
-        $comment = '';
-
         // In order to be able to format the queries correctly, the next token
         // must be taken into consideration. The loop below uses two pointers,
         // `$prev` and `$curr` which store two consecutive tokens.
@@ -338,39 +334,26 @@ class Formatter
             /**
              * Token parsed at this moment.
              *
-             * @var Token
+             * @var Token $curr
              */
             $curr = $list->tokens[$list->idx];
 
             if ($curr->type === Token::TYPE_WHITESPACE) {
                 // Whitespaces are skipped because the formatter adds its own.
                 continue;
-            } elseif ($curr->type === Token::TYPE_COMMENT) {
-                // Whether the comments should be parsed.
-                if (!empty($this->options['remove_comments'])) {
-                    continue;
-                }
+            }
 
-                if ($list->tokens[$list->idx - 1]->type === Token::TYPE_WHITESPACE) {
-                    // The whitespaces before and after are preserved for
-                    // formatting reasons.
-                    $comment .= $list->tokens[$list->idx - 1]->token;
-                }
-                $comment .= $this->toString($curr);
-                if (($list->tokens[$list->idx + 1]->type === Token::TYPE_WHITESPACE)
-                    && ($list->tokens[$list->idx + 2]->type !== Token::TYPE_COMMENT)
-                ) {
-                    // Adding the next whitespace only there is no comment that
-                    // follows it immediately which may cause adding a
-                    // whitespace twice.
-                    $comment .= $list->tokens[$list->idx + 1]->token;
-                }
-
-                // Everything was handled here, no need to continue.
+            if ($curr->type === Token::TYPE_COMMENT && $this->options['remove_comments']) {
+                // Skip Comments if option `remove_comments` is enabled
                 continue;
             }
 
             // Checking if pointers were initialized.
+            /**
+             * Previous Token.
+             *
+             * @var Token $prev
+             */
             if ($prev !== null) {
                 // Checking if a new clause started.
                 if (static::isClause($prev) !== false) {
@@ -379,12 +362,16 @@ class Formatter
                 }
 
                 // The options of a clause should stay on the same line and everything that follows.
-                if (($this->options['parts_newline'])
-                    && (!$formattedOptions)
-                    && (empty(self::$INLINE_CLAUSES[$lastClause]))
-                    && (($curr->type !== Token::TYPE_KEYWORD)
-                    || (($curr->type === Token::TYPE_KEYWORD)
-                    && ($curr->flags & Token::FLAG_KEYWORD_FUNCTION)))
+                if ($this->options['parts_newline']
+                    && !$formattedOptions
+                    && empty(self::$INLINE_CLAUSES[$lastClause])
+                    && (
+                        $curr->type !== Token::TYPE_KEYWORD
+                        || (
+                            $curr->type === Token::TYPE_KEYWORD
+                            && $curr->flags & Token::FLAG_KEYWORD_FUNCTION
+                        )
+                    )
                 ) {
                     $formattedOptions = true;
                     $lineEnded = true;
@@ -393,7 +380,7 @@ class Formatter
 
                 // Checking if this clause ended.
                 if ($tmp = static::isClause($curr)) {
-                    if (($tmp == 2) || ($this->options['clause_newline'])) {
+                    if ($tmp == 2 || $this->options['clause_newline']) {
                         $lineEnded = true;
                         if ($this->options['parts_newline']) {
                             --$indent;
@@ -402,24 +389,26 @@ class Formatter
                 }
 
                 // Indenting BEGIN ... END blocks.
-                if (($prev->type === Token::TYPE_KEYWORD) && ($prev->value === 'BEGIN')) {
+                if ($prev->type === Token::TYPE_KEYWORD && $prev->value === 'BEGIN') {
                     $lineEnded = true;
                     array_push($blocksIndentation, $indent);
                     ++$indent;
-                } elseif (($curr->type === Token::TYPE_KEYWORD) && ($curr->value === 'END')) {
+                } elseif ($curr->type === Token::TYPE_KEYWORD && $curr->value === 'END') {
                     $lineEnded = true;
                     $indent = array_pop($blocksIndentation);
                 }
 
                 // Formatting fragments delimited by comma.
-                if (($prev->type === Token::TYPE_OPERATOR) && ($prev->value === ',')) {
+                if ($prev->type === Token::TYPE_OPERATOR && $prev->value === ',') {
                     // Fragments delimited by a comma are broken into multiple
                     // pieces only if the clause is not inlined or this fragment
                     // is between brackets that are on new line.
-                    if (((empty(self::$INLINE_CLAUSES[$lastClause]))
-                        && !$shortGroup
-                        && ($this->options['parts_newline']))
-                        || (end($blocksLineEndings) === true)
+                    if (end($blocksLineEndings) === true
+                        || (
+                            empty(self::$INLINE_CLAUSES[$lastClause])
+                            && !$shortGroup
+                            && $this->options['parts_newline']
+                        )
                     ) {
                         $lineEnded = true;
                     }
@@ -428,7 +417,7 @@ class Formatter
                 // Handling brackets.
                 // Brackets are indented only if the length of the fragment between
                 // them is longer than 30 characters.
-                if (($prev->type === Token::TYPE_OPERATOR) && ($prev->value === '(')) {
+                if ($prev->type === Token::TYPE_OPERATOR && $prev->value === '(') {
                     array_push($blocksIndentation, $indent);
                     $shortGroup = true;
                     if (static::getGroupLength($list) > 30) {
@@ -437,18 +426,12 @@ class Formatter
                         $shortGroup = false;
                     }
                     array_push($blocksLineEndings, $lineEnded);
-                } elseif (($curr->type === Token::TYPE_OPERATOR) && ($curr->value === ')')) {
+                } elseif ($curr->type === Token::TYPE_OPERATOR && $curr->value === ')') {
                     $indent = array_pop($blocksIndentation);
                     $lineEnded |= array_pop($blocksLineEndings);
                     $shortGroup = false;
                 }
 
-                // Delimiter must be placed on the same line with the last
-                // clause.
-                if ($curr->type === Token::TYPE_DELIMITER) {
-                    $lineEnded = false;
-                }
-
                 // Adding the token.
                 $ret .= $this->toString($prev);
 
@@ -459,33 +442,29 @@ class Formatter
                         $indent = 0;
                     }
 
-                    if ($curr->type !== Token::TYPE_COMMENT) {
-                        $ret .= $this->options['line_ending']
-                            . str_repeat($this->options['indentation'], $indent);
-                    }
+                    $ret .= $this->options['line_ending']
+                        . str_repeat($this->options['indentation'], $indent);
+
                     $lineEnded = false;
                 } else {
                     // If the line ended there is no point in adding whitespaces.
                     // Also, some tokens do not have spaces before or after them.
-                    if (!((($prev->type === Token::TYPE_OPERATOR) && (($prev->value === '.') || ($prev->value === '(')))
-                        // No space after . (
-                        || (($curr->type === Token::TYPE_OPERATOR) && (($curr->value === '.') || ($curr->value === ',')
-                        || ($curr->value === '(') || ($curr->value === ')')))
-                        // No space before . , ( )
-                        || (($curr->type === Token::TYPE_DELIMITER)) && (mb_strlen($curr->value, 'UTF-8') < 2))
+                    if (
                         // A space after delimiters that are longer than 2 characters.
-                        || ($prev->value === 'DELIMITER')
+                        $prev->value === 'DELIMITER'
+                        || !(
+                            ($prev->type === Token::TYPE_OPERATOR && ($prev->value === '.' || $prev->value === '('))
+                            // No space after . (
+                            || ($curr->type === Token::TYPE_OPERATOR && ($curr->value === '.' || $curr->value === ',' || $curr->value === '(' || $curr->value === ')'))
+                            // No space before . , ( )
+                            || $curr->type === Token::TYPE_DELIMITER && mb_strlen($curr->value, 'UTF-8') < 2
+                        )
                     ) {
                         $ret .= ' ';
                     }
                 }
             }
 
-            if (!empty($comment)) {
-                $ret .= $comment;
-                $comment = '';
-            }
-
             // Iteration finished, consider current token as previous.
             $prev = $curr;
         }
@@ -524,8 +503,8 @@ class Formatter
         $text = $token->token;
 
         foreach ($this->options['formats'] as $format) {
-            if (($token->type === $format['type'])
-                && (($token->flags & $format['flags']) === $format['flags'])
+            if ($token->type === $format['type']
+                && ($token->flags & $format['flags']) === $format['flags']
             ) {
                 // Running transformation function.
                 if (!empty($format['function'])) {
@@ -626,11 +605,14 @@ class Formatter
      */
     public static function isClause($token)
     {
-        if ((($token->type === Token::TYPE_NONE) && (strtoupper($token->token) === 'DELIMITER'))
-            || (($token->type === Token::TYPE_KEYWORD) && (isset(Parser::$STATEMENT_PARSERS[$token->value])))
+        if (
+            ($token->type === Token::TYPE_KEYWORD && isset(Parser::$STATEMENT_PARSERS[$token->value]))
+            || ($token->type === Token::TYPE_NONE && strtoupper($token->token) === 'DELIMITER')
         ) {
             return 2;
-        } elseif (($token->type === Token::TYPE_KEYWORD) && (isset(Parser::$KEYWORD_PARSERS[$token->value]))) {
+        } elseif (
+            $token->type === Token::TYPE_KEYWORD && isset(Parser::$KEYWORD_PARSERS[$token->value])
+        ) {
             return 1;
         }
 

From 1a72482ec472fbdd7e94ed099901a5b03bfb2213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 14:18:27 +0100
Subject: [PATCH 47/63] Do not try to unset not set array
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Sanitize.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php
index 907de333c2..5caa11122f 100644
--- a/libraries/Sanitize.php
+++ b/libraries/Sanitize.php
@@ -435,16 +435,16 @@ class Sanitize
 
             // allowed stuff could be compromised so escape it
             // we require it to be a string
-            if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
+            if (isset($_REQUEST) && isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
                 unset($_REQUEST[$key]);
             }
-            if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
+            if (isset($_POST) && isset($_POST[$key]) && ! is_string($_POST[$key])) {
                 unset($_POST[$key]);
             }
-            if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
+            if (isset($_COOKIE) && isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
                 unset($_COOKIE[$key]);
             }
-            if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
+            if (isset($_GET) && isset($_GET[$key]) && ! is_string($_GET[$key])) {
                 unset($_GET[$key]);
             }
         }

From 593f71dd238fcca9b1474111b86bb566206a2832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 16:24:34 +0100
Subject: [PATCH 48/63] Fixed filtering for active processes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are dozen of process states when executing the query, we can't
filter just for one of them. Let's rather exclude those without state
and are idling.

See also http://dev.mysql.com/doc/refman/5.7/en/general-thread-states.html

Fixes #12732

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                 | 1 +
 libraries/server_status_processes.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8857dd820b..cf3ab5a81b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog
 - issue #12876 Fix possible PHP error in navigation
 - issue #12881 Fix database search with newer php-gettext
 - issue #12894 Fix linter error on unterminated variable name
+- issue #12732 Fixed filtering for active processes
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index b55226e0e8..435039f2e2 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -112,7 +112,7 @@ function PMA_getHtmlForServerProcesslist()
         $sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ';
     }
     if (! empty($_REQUEST['showExecuting'])) {
-        $sql_query .= ' WHERE state = "executing" ';
+        $sql_query .= ' WHERE state != "" ';
     }
     if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) {
         $sql_query .= ' ORDER BY '

From 3d056bc49feef55c46bfa31370b89fd539ee591f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 16:29:55 +0100
Subject: [PATCH 49/63] Do not execute tearDown if not configured
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apparently the tearDown method can be executed for skipped tests in some
cases and it will fail due to failed initilization.

Fixes #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/selenium/PmaSeleniumDbEventsTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/selenium/PmaSeleniumDbEventsTest.php b/test/selenium/PmaSeleniumDbEventsTest.php
index 335679a078..cd200c8a9d 100644
--- a/test/selenium/PmaSeleniumDbEventsTest.php
+++ b/test/selenium/PmaSeleniumDbEventsTest.php
@@ -66,7 +66,9 @@ class PMA_SeleniumDbEventsTest extends PMA_SeleniumBase
      */
     public function tearDown()
     {
-        $this->dbQuery("SET GLOBAL event_scheduler=\"OFF\"");
+        if ($this->_mysqli != null) {
+            $this->dbQuery("SET GLOBAL event_scheduler=\"OFF\"");
+        }
         parent::tearDown();
     }
 

From 3c2c39267c4b400fbe63a9f046defd2e868e5614 Mon Sep 17 00:00:00 2001
From: Shreyas Sinha <shreyas.sinha14@gmail.com>
Date: Fri, 20 Jan 2017 21:22:59 +0530
Subject: [PATCH 50/63] Requested Changes

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
---
 js/functions.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 986bff6559..13a300d259 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -522,11 +522,12 @@ function PMA_current_version(data)
         var latest = parseVersionString(data.version);
         var url = 'https://web.phpmyadmin.net/files/' + escapeHtml(encodeURIComponent(data.version)) + '/';
         var version_information_message = document.createElement('span');
-        version_information_message.class = 'latest';
+        version_information_message.className = 'latest';
         var version_information_message_link = document.createElement('a');
         version_information_message_link.href = url;
-        version_information_message_link.class = 'disableAjax';
-        version_information_message_link.innerHTML = escapeHtml(data.version);
+        version_information_message_link.className = 'disableAjax';
+        version_information_message_link_text = document.createTextNode(data.version);
+        version_information_message_link.appendChild(version_information_message_link_text);
         var prefix_message = document.createTextNode(PMA_messages.strLatestAvailable);
         version_information_message.appendChild(prefix_message);
         version_information_message.appendChild(version_information_message_link);
@@ -544,20 +545,21 @@ function PMA_current_version(data)
             $('#newer_version_notice').remove();
             var maincontainer_div = document.createElement('div');
             maincontainer_div.id = 'newer_version_notice';
-            maincontainer_div.class = htmlClass;
+            maincontainer_div.className = htmlClass;
             var maincontainer_div_link = document.createElement('a');
             maincontainer_div_link.href = url;
-            maincontainer_div_link.class = "disableAjax";
-            maincontainer_div_link.innerHTML = message;
+            maincontainer_div_link.className = 'disableAjax';
+            maincontainer_div_link_text = document.createTextNode(message);
+            maincontainer_div_link.appendChild(maincontainer_div_link_text);
             maincontainer_div.appendChild(maincontainer_div_link);
-            document.getElementById("maincontainer").appendChild(maincontainer_div);
+            $('#maincontainer').append($(maincontainer_div));
         }
         if (latest === current) {
             version_information_message = document.createTextNode(' (' + PMA_messages.strUpToDate + ')');
         }
         var $liPmaVersion = $('#li_pma_version');
         $liPmaVersion.find('span.latest').remove();
-        document.getElementById("li_pma_version").appendChild(version_information_message);
+        $liPmaVersion.append($(version_information_message));
     }
 }
 

From 28406154ab223a242d37eea8be0439ea0e33ab8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 17:38:03 +0100
Subject: [PATCH 51/63] Revert "Do not try to unset not set array"

This reverts commit 1a72482ec472fbdd7e94ed099901a5b03bfb2213.
---
 libraries/Sanitize.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php
index 5caa11122f..907de333c2 100644
--- a/libraries/Sanitize.php
+++ b/libraries/Sanitize.php
@@ -435,16 +435,16 @@ class Sanitize
 
             // allowed stuff could be compromised so escape it
             // we require it to be a string
-            if (isset($_REQUEST) && isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
+            if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
                 unset($_REQUEST[$key]);
             }
-            if (isset($_POST) && isset($_POST[$key]) && ! is_string($_POST[$key])) {
+            if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
                 unset($_POST[$key]);
             }
-            if (isset($_COOKIE) && isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
+            if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
                 unset($_COOKIE[$key]);
             }
-            if (isset($_GET) && isset($_GET[$key]) && ! is_string($_GET[$key])) {
+            if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
                 unset($_GET[$key]);
             }
         }

From bc1048a580b1a2c31e5fcde77b41c95ada8bd530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 17:39:12 +0100
Subject: [PATCH 52/63] Ensure expected global variables are set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This probably happens only in tests in some specific setup.

Fixes #12910

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Sanitize.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php
index 907de333c2..0011705c3d 100644
--- a/libraries/Sanitize.php
+++ b/libraries/Sanitize.php
@@ -423,6 +423,18 @@ class Sanitize
         // do not check only $_REQUEST because it could have been overwritten
         // and use type casting because the variables could have become
         // strings
+        if (! isset($_REQUEST)) {
+            $_REQUEST = array();
+        }
+        if (! isset($_GET)) {
+            $_GET = array();
+        }
+        if (! isset($_POST)) {
+            $_POST = array();
+        }
+        if (! isset($_COOKIE)) {
+            $_COOKIE = array();
+        }
         $keys = array_keys(
             array_merge((array)$_REQUEST, (array)$_GET, (array)$_POST, (array)$_COOKIE)
         );

From 005a5fe6f83a72a027170dde4f87dd9acec4407a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 18:11:54 +0100
Subject: [PATCH 53/63] Fix syntax error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/server_status_queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index 99ac4bbf40..82bde743e4 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,7 +16,7 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(JSON.parse($('#serverstatusquerieschart').data('chart'))), function (key, value) {
+        $.each(JSON.parse($('#serverstatusquerieschart').data('chart')), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
         $('#serverstatusquerieschart').data(

From ad665e2c4b9afeb0d24a78056ad0dd834e401066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 11:05:44 +0100
Subject: [PATCH 54/63] Simplify data parsing, it seems that JSON is
 automatically parsed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/server_status_queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index 82bde743e4..056cffebc7 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,7 +16,7 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(JSON.parse($('#serverstatusquerieschart').data('chart')), function (key, value) {
+        $.each($('#serverstatusquerieschart').data('chart'), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
         $('#serverstatusquerieschart').data(

From b2a19c5be9b8bd914e6f75526d3363f881fac90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20He=C3=9Fe?= <hesse.daniel93@gmail.com>
Date: Fri, 20 Jan 2017 22:55:16 +0000
Subject: [PATCH 55/63] Translated using Weblate (German)

Currently translated at 99.4% (3221 of 3239 strings)

[CI skip]
---
 po/de.po | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/po/de.po b/po/de.po
index 3edd135f5a..972a2a0abe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-12-13 10:40+0100\n"
-"PO-Revision-Date: 2016-12-21 16:03+0000\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"de/>\n"
+"PO-Revision-Date: 2017-01-20 22:55+0000\n"
+"Last-Translator: Daniel Heße <hesse.daniel93@gmail.com>\n"
+"Language-Team: German "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:39 license.php:34
 #, php-format
@@ -11944,6 +11944,9 @@ msgid ""
 "No routine with name %1$s found in database %2$s. You might be lacking the "
 "necessary privileges to view/export this routine."
 msgstr ""
+"Keine Routine mit dem Namen %1$s in der Datenbank %2$s gefunden. "
+"Möglicherweise fehlen Ihnen die nötigen Rechte un diese Routine anzusehen/zu "
+"exportieren."
 
 #: libraries/rte/rte_words.lib.php:42
 #, php-format
@@ -11968,17 +11971,14 @@ msgid "trigger"
 msgstr "Trigger"
 
 #: libraries/rte/rte_words.lib.php:54
-#, fuzzy
-#| msgid "You do not have the necessary privileges to create a trigger"
 msgid "You do not have the necessary privileges to create a trigger."
 msgstr ""
-"Sie haben nicht die notwendigen Rechte um einen neuen Trigger zu erstellen"
+"Sie haben nicht die notwendigen Rechte um einen neuen Trigger zu erstellen."
 
 #: libraries/rte/rte_words.lib.php:56
-#, fuzzy, php-format
-#| msgid "No trigger with name %1$s found in database %2$s"
+#, php-format
 msgid "No trigger with name %1$s found in database %2$s."
-msgstr "Keine Trigger namens %1$s in der Datenbank %2$s gefunden"
+msgstr "Keine Trigger namens %1$s in der Datenbank %2$s gefunden."
 
 #: libraries/rte/rte_words.lib.php:57
 msgid "There are no triggers to display."
@@ -11998,17 +11998,15 @@ msgid "event"
 msgstr "Ereignis"
 
 #: libraries/rte/rte_words.lib.php:68
-#, fuzzy
-#| msgid "You do not have the necessary privileges to create an event"
 msgid "You do not have the necessary privileges to create an event."
 msgstr ""
-"Sie haben nicht die erforderlichen Rechte, um ein neues Ereignis zu erstellen"
+"Sie haben nicht die erforderlichen Rechte, um ein neues Ereignis zu "
+"erstellen."
 
 #: libraries/rte/rte_words.lib.php:70
-#, fuzzy, php-format
-#| msgid "No event with name %1$s found in database %2$s"
+#, php-format
 msgid "No event with name %1$s found in database %2$s."
-msgstr "Es wurde kein Ereignis mit dem Namen %1$s in Datenbank %2$s gefunden"
+msgstr "Es wurde kein Ereignis mit dem Namen %1$s in Datenbank %2$s gefunden."
 
 #: libraries/rte/rte_words.lib.php:71
 msgid "There are no events to display."
@@ -15820,14 +15818,12 @@ msgstr "Eine öffnende Klammer wurde erwartet."
 #: vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php:227
 #: vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php:165
 #: vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php:193
-#, fuzzy
-#| msgid "Unexpected token."
 msgid "Unexpected keyword."
-msgstr "Unerwartetes Zeichen."
+msgstr "Unerwartetes Schlüsselwort."
 
 #: vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php:202
 msgid "Unexpected end of CASE expression"
-msgstr ""
+msgstr "Unerwartetes Ende eines CASE Ausdrucks"
 
 #: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:227
 msgid ""
@@ -15884,7 +15880,7 @@ msgstr "Diese Option widerspricht „%1$s“."
 #, fuzzy, php-format
 #| msgid "Ending quote %1$s was expected."
 msgid "Value/Expression for the option %1$s was expected"
-msgstr "Schließendes Anführungszeichen %1$s wurde erzeugt."
+msgstr "Wert/Ausdruck für die Option %1$s erwartet"
 
 #: vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php:101
 msgid "The old name of the table was expected."

From 9484413e3d9f5d5de9769287185fe276cb96e689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 16:42:25 +0100
Subject: [PATCH 56/63] Specify we are using MySQL service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 77e5ca62dc..514b27248b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@
 
 language: php
 
+services:
+  - mysql
+
 php:
   - "7.1"
   - "7.0"

From 9d24e4649b8d69594d4aa2cd3cef8e5c9c645b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 20 Jan 2017 19:12:19 +0100
Subject: [PATCH 57/63] Do not create database if exits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 514b27248b..b07625a561 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
 
 before_script:
   - export PATH=~/.composer/vendor/bin/:$PATH
-  - mysql -uroot -e "CREATE DATABASE test"
+  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS test"
   - mysql -uroot < sql/create_tables.sql
   - mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')"
   - ./test/start-local-server

From 9ecda4175b6c19c781cf23254da151bfa15eb81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 11:42:00 +0100
Subject: [PATCH 58/63] Run Travis CI tests on OS X as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- install dependencies using brew
- manuall start MariaDB server

Issue #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml         | 12 ++++++++++++
 test/ci-test        |  2 +-
 test/install-runkit |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b07625a561..4c675666a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,18 @@ matrix:
       env: CI_MODE=release
     - php: "7.0"
       env: CI_MODE=docs
+    - os: osx
+      language: generic
+      env: CI_MODE=test
+      before_install:
+        - brew tap homebrew/php
+        - brew update
+        - brew install ant gettext php70 mariadb
+        - brew link --force gettext
+        - curl https://getcomposer.org/installer | php
+        - ln -s /Users/travis/build/phpmyadmin/phpmyadmin/composer.phar /usr/local/bin/composer
+        - mysql.server start
+
 cache:
   directories:
     - $HOME/.composer/cache/
diff --git a/test/ci-test b/test/ci-test
index 49f87891f8..da8bd65c60 100755
--- a/test/ci-test
+++ b/test/ci-test
@@ -4,7 +4,7 @@ ant locales
 
 export PHPUNIT_ARGS="--exclude-group selenium"
 
-if [ $TRAVIS_PHP_VERSION = "hhvm" ] ; then
+if [ "$TRAVIS_PHP_VERSION" = "hhvm" ] ; then
     ant phpunit-hhvm
 else
     ant phpunit
diff --git a/test/install-runkit b/test/install-runkit
index 7fde346b05..180d4ca139 100755
--- a/test/install-runkit
+++ b/test/install-runkit
@@ -6,7 +6,7 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then
     exit 1
 fi
 
-if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1" ] ; then
+if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1" -o "$TRAVIS_OS_NAME" = "osx" ] ; then
     exit 0
 fi
 

From 393402406180291d84161d72baa7d9dbf4e5dee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 12:24:00 +0100
Subject: [PATCH 59/63] Handle AM/PM marks in date on our own
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is same as with months and days in week - we can not rely on the
PHP providing sane result. Also this way we can properly translate it to
all supported languages.

For example on OS X, the strftime function does not seem to respect PHP
locales and always use system ones.

Fixes #12913

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Util.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libraries/Util.php b/libraries/Util.php
index 1333fc2069..684e8c4c58 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -1603,6 +1603,15 @@ class Util
             $date
         );
 
+        /* Fill in AM/PM */
+        $hours = (int)date('H', $timestamp);
+        if ($hours >= 12) {
+            $am_pm = _pgettext('AM/PM indication in time', 'PM');
+        } else {
+            $am_pm = _pgettext('AM/PM indication in time', 'AM');
+        }
+        $date = preg_replace('@%[pP]@', $am_pm, $date);
+
         $ret = strftime($date, $timestamp);
         // Some OSes such as Win8.1 Traditional Chinese version did not produce UTF-8
         // output here. See https://sourceforge.net/p/phpmyadmin/bugs/4207/

From d2ade81788bf07927ffe807524d835c05b034329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 12:46:42 +0100
Subject: [PATCH 60/63] Assert for language selection only in case locales are
 available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12911

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .../plugin/auth/AuthenticationCookieTest.php       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index 4ebc79a509..327ca48557 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -306,11 +306,15 @@ class AuthenticationCookieTest extends PMATestCase
             $result
         );
 
-        $this->assertContains(
-            '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
-            'id="sel-lang">',
-            $result
-        );
+        // Check for language selection if locales are there
+        $loc = LOCALE_PATH . '/cs/LC_MESSAGES/phpmyadmin.mo';
+        if (is_readable($loc)) {
+            $this->assertContains(
+                '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
+                'id="sel-lang">',
+                $result
+            );
+        }
 
         $this->assertContains(
             '<form method="post" action="index.php" name="login_form" ' .

From 1361b4eac55582d9126bf8a62abbaaf4702647a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 13:00:42 +0100
Subject: [PATCH 61/63] Do not rely on fixed build path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4c675666a7..ccb6706e04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ matrix:
         - brew install ant gettext php70 mariadb
         - brew link --force gettext
         - curl https://getcomposer.org/installer | php
-        - ln -s /Users/travis/build/phpmyadmin/phpmyadmin/composer.phar /usr/local/bin/composer
+        - ln -s `readlink -f ./composer.phar` /usr/local/bin/composer
         - mysql.server start
 
 cache:

From 9105cff3d56fb7190cd950a97b6253ef0236d556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 13:42:44 +0100
Subject: [PATCH 62/63] The readlink -f is not working on OS X, use pwd instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ccb6706e04..fa6c36ab48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ matrix:
         - brew install ant gettext php70 mariadb
         - brew link --force gettext
         - curl https://getcomposer.org/installer | php
-        - ln -s `readlink -f ./composer.phar` /usr/local/bin/composer
+        - ln -s "`pwd`/composer.phar" /usr/local/bin/composer
         - mysql.server start
 
 cache:

From b2e2e770d9cd2a32c3c09a6da4dd8309c794bf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 14:57:00 +0100
Subject: [PATCH 63/63] Use server returned table name on renaming table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12901

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog            | 1 +
 js/tbl_operations.js | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb4130a999..e6b8a024d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog
 - issue #12834 Fixed margins in central columns feature
 - issue #12903 Document more export configuration options
 - issue #12897 Use consistent numeric format for table overhead
+- issue #12901 Use server returned table name on renaming table
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
index 8d494d541a..020e1a7dc4 100644
--- a/js/tbl_operations.js
+++ b/js/tbl_operations.js
@@ -55,13 +55,11 @@ AJAX.registerOnload('tbl_operations.js', function () {
     $(document).on('submit', "#moveTableForm", function (event) {
         event.preventDefault();
         var $form = $(this);
-        var db = $form.find('select[name=target_db]').val();
-        var tbl = $form.find('input[name=new_name]').val();
         PMA_prepareForAjaxRequest($form);
         $.post($form.attr('action'), $form.serialize() + "&submit_move=1", function (data) {
             if (typeof data !== 'undefined' && data.success === true) {
-                PMA_commonParams.set('db', db);
-                PMA_commonParams.set('table', tbl);
+                PMA_commonParams.set('db', data._params.db);
+                PMA_commonParams.set('table', data._params.tbl);
                 PMA_commonActions.refreshMain(false, function () {
                     PMA_ajaxShowMessage(data.message);
                 });