From 80d7f0dfa34ad3881ca5356886ec08f9e173eb17 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 2 Mar 2023 16:23:07 +0000 Subject: [PATCH 1/4] Fix warning on non-existent table Signed-off-by: Kamil Tekiela --- libraries/classes/Plugins/Export/ExportXml.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 25c11eca8a..f8dc1034c4 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -275,6 +275,11 @@ class ExportXml extends ExportPlugin . Util::backquote($table), 0 ); + + if ($result === []) { + continue; + } + $tbl = (string) $result[$table][1]; $is_view = $dbi->getTable($db, $table) From 63245891a900ee718a13082ea7cce10d325d7b40 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Thu, 2 Mar 2023 21:51:42 +0100 Subject: [PATCH 2/4] Check if importNotification is not null Signed-off-by: Liviu-Mihail Concioiu --- js/src/import.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/src/import.js b/js/src/import.js index 989b35b51f..8f66924795 100644 --- a/js/src/import.js +++ b/js/src/import.js @@ -16,9 +16,11 @@ function changePluginOpts () { $('#' + selectedPluginName + '_options').fadeIn('slow'); const importNotification = document.getElementById('import_notification'); - importNotification.innerText = ''; - if (selectedPluginName === 'csv') { - importNotification.innerHTML = ''; + if (importNotification) { + importNotification.innerText = ''; + if (selectedPluginName === 'csv') { + importNotification.innerHTML = ''; + } } } From b166c0e59b3141bcb2a696e1b9f41fad25c078db Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Sat, 4 Mar 2023 17:31:50 +0000 Subject: [PATCH 3/4] Translated using Weblate (Romanian) Currently translated at 91.7% (3144 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ro/ Signed-off-by: liviuconcioiu --- po/ro.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ro.po b/po/ro.po index 79ca43958c..bb9d13f02e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-02-08 15:09+0000\n" -"PO-Revision-Date: 2023-01-28 03:53+0000\n" +"PO-Revision-Date: 2023-03-05 11:20+0000\n" "Last-Translator: liviuconcioiu \n" "Language-Team: Romanian \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 4.16-dev\n" +"X-Generator: Weblate 4.16.2-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -948,7 +948,7 @@ msgstr "" #: libraries/advisory_rules_generic.php:599 msgid "Is InnoDB disabled?" -msgstr "Este InnoDB dizactivat?" +msgstr "Este InnoDB dezactivat?" #: libraries/advisory_rules_generic.php:603 msgid "You do not have InnoDB enabled." From 1d6dada3428a3ef9896baeda5e6a596a6ec8e60c Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 5 Mar 2023 19:02:51 +0100 Subject: [PATCH 4/4] Fix error when changing password Signed-off-by: Liviu-Mihail Concioiu --- js/src/functions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/src/functions.js b/js/src/functions.js index 82c187d865..cf51947dd3 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -584,7 +584,11 @@ Functions.suggestPassword = function (passwordForm) { passwordForm.elements.pma_pw2.value = passwd.value; var meterObj = $jQueryPasswordForm.find('meter[name="pw_meter"]').first(); var meterObjLabel = $jQueryPasswordForm.find('span[name="pw_strength"]').first(); - Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, passwordForm.elements.username.value); + var username = ''; + if (passwordForm.elements.username) { + username = passwordForm.elements.username.value; + } + Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, username); return true; };