Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-08-28 17:23:56 -03:00
commit 823408d759
3 changed files with 4 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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 .= '</fieldset>' . "\n";
return $html_output;
}
/**