diff --git a/ChangeLog b/ChangeLog index 67ed1b1859..8066533a20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog - issue Update jQuery Validation to v1.19.1 - issue Update jQuery to v3.4.1 - issue Update js-cookie to v2.2.1 +- issue Remove fieldset closing tag when setting global privileges 4.9.0.1 (2019-06-04) - issue #14478 phpMyAdmin no longer streams the export data diff --git a/doc/config.rst b/doc/config.rst index 5808de2b87..530cdf40fe 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -3048,9 +3048,9 @@ the files. :type: string :default: ``''`` - The name of the directory where dumps can be saved. + The name of the webserver directory where exported files can be saved. - If you want different directory for each user, %u will be replaced with + If you want a different directory for each user, %u will be replaced with the username. Please note that the directory must exist and has to be writable for diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 7cff009e2a..64fb761fb1 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -925,13 +925,9 @@ class Privileges ], ]; - $html_output = $this->template->render('server/privileges/resource_limits', [ + return $this->template->render('server/privileges/resource_limits', [ 'limits' => $limits, ]); - - $html_output .= '' . "\n"; - - return $html_output; } /**