Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 1cde51cf70ab · 2023-09-28T19:31:02.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/modules/ajax.ts b/js/src/modules/ajax.ts
@@ -933,12 +933,16 @@ const AJAX = {
      * @return {function(JQuery.Event, JQuery.jqXHR): void}
      */
     getFatalErrorHandler: function () {
-        return function (event, request) {
+        return function (event, request, settings) {
             if (AJAX.debug) {
                 // eslint-disable-next-line no-console
                 console.log('AJAX error: status=' + request.status + ', text=' + request.statusText);
             }
 
+            if (settings.url.includes('/git-revision')) {
+                return;
+            }
+
             // Don't handle aborted requests
             if (request.status !== 0 || request.statusText !== 'abort') {
                 var details = '';
diff --git a/js/src/modules/git-info.ts b/js/src/modules/git-info.ts
@@ -125,13 +125,15 @@ const GitInfo = {
                 'server': CommonParams.get('server'),
                 'ajax_request': true,
                 'no_debug': true
-            },
-            data => {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    $(data.message).insertAfter('#li_pma_version');
-                }
             }
-        );
+        ).done(function (data): void {
+            if (typeof data !== 'undefined' && data.success === true) {
+                $(data.message).insertAfter('#li_pma_version');
+            }
+        }).fail(function (): void {
+            const gitHashInfoLi = '<li id="li_pma_version_git" class="list-group-item">' + window.Messages.errorLoadingGitInformation + '</li>';
+            $(gitHashInfoLi).insertAfter('#li_pma_version');
+        });
     },
 
     /**
diff --git a/src/Controllers/JavaScriptMessagesController.php b/src/Controllers/JavaScriptMessagesController.php
@@ -615,6 +615,7 @@ private function getMessages(): array
             /* l10n: Latest available phpMyAdmin version */
             'strLatestAvailable' => __(', latest stable version:'),
             'strUpToDate' => __('up to date'),
+            'errorLoadingGitInformation' => __('There was an error in loading the Git information.'),
 
             /* Error Reporting */
             'strErrorOccurred' => __('A fatal JavaScript error has occurred. Would you like to send an error report?'),
diff --git a/src/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/src/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
@@ -17,7 +17,6 @@
 use function fgets;
 use function fwrite;
 use function htmlspecialchars;
-use function is_resource;
 use function proc_close;
 use function proc_open;
 use function sprintf;
@@ -132,7 +131,7 @@ public function applyTransformation(string $buffer, array $options = [], FieldMe
         $newstring = '';
         $descriptorspec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w']];
         $process = proc_open($program . ' ' . $options[1], $descriptorspec, $pipes);
-        if (is_resource($process)) {
+        if ($process !== false) {
             fwrite($pipes[0], $buffer);
             fclose($pipes[0]);
 
