Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@317df45 · GitHub
Skip to content

Commit 317df45

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 5246ea3 + 15a9de5 commit 317df45

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

‎js/src/import.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ function changePluginOpts () {
2525
$('#' + selectedPluginName + '_options').fadeIn('slow');
2626

2727
const importNotification = document.getElementById('import_notification');
28-
importNotification.innerText = '';
29-
if (selectedPluginName === 'csv') {
30-
importNotification.innerHTML = '<div class="alert alert-info mb-0 mt-3" role="alert">' + window.Messages.strImportCSV + '</div>';
28+
if (importNotification) {
29+
importNotification.innerText = '';
30+
if (selectedPluginName === 'csv') {
31+
importNotification.innerHTML = '<div class="alert alert-info mb-0 mt-3" role="alert">' + window.Messages.strImportCSV + '</div>';
32+
}
3133
}
3234
}
3335

‎js/src/modules/functions.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,11 @@ Functions.suggestPassword = function (passwordForm) {
452452
passwordForm.elements.pma_pw2.value = passwd.value;
453453
var meterObj = $jQueryPasswordForm.find('meter[name="pw_meter"]').first();
454454
var meterObjLabel = $jQueryPasswordForm.find('span[name="pw_strength"]').first();
455-
Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, passwordForm.elements.username.value);
455+
var username = '';
456+
if (passwordForm.elements.username) {
457+
username = passwordForm.elements.username.value;
458+
}
459+
Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, username);
456460
return true;
457461
};
458462

‎libraries/classes/Plugins/Export/ExportXml.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,11 @@ public function exportHeader(): bool
258258
. Util::backquote($table),
259259
0,
260260
);
261+
262+
if ($result === []) {
263+
continue;
264+
}
265+
261266
$tbl = (string) $result[$table][1];
262267

263268
$is_view = $GLOBALS['dbi']->getTable($GLOBALS['db'], $table)

0 commit comments

Comments
 (0)