Merge pull request #22848 from braders/extension-manager-notices

[civicrm-core.git] / CRM / Admin / Page / ExtensionsUpgrade.php

diff --git a/CRM/Admin/Page/ExtensionsUpgrade.php b/CRM/Admin/Page/ExtensionsUpgrade.php
index 2b5c610503a82cfbb97e97561a96388c4bb996dc..3a183826fc258cba1a018f82a2c839a591fa30b6 100644 (file)
--- a/CRM/Admin/Page/ExtensionsUpgrade.php
+++ b/CRM/Admin/Page/ExtensionsUpgrade.php
@@ -15,16 +15,17 @@ class CRM_Admin_Page_ExtensionsUpgrade extends CRM_Core_Page {
    */
   public function run() {
     $queue = CRM_Extension_Upgrades::createQueue();
-    $runner = new CRM_Queue_Runner(array(
+    $runner = new CRM_Queue_Runner([
       'title' => ts('Database Upgrades'),
       'queue' => $queue,
       'errorMode' => CRM_Queue_Runner::ERROR_ABORT,
-      'onEnd' => array('CRM_Admin_Page_ExtensionsUpgrade', 'onEnd'),
-      'onEndUrl' => CRM_Utils_System::url(self::END_URL, self::END_PARAMS),
-    ));
+      'onEnd' => ['CRM_Admin_Page_ExtensionsUpgrade', 'onEnd'],
+      'onEndUrl' => !empty($_GET['destination']) ? $_GET['destination'] : CRM_Utils_System::url(self::END_URL, self::END_PARAMS),
+    ]);
 
     CRM_Core_Error::debug_log_message('CRM_Admin_Page_ExtensionsUpgrade: Start upgrades');
-    $runner->runAllViaWeb(); // does not return
+    // does not return
+    $runner->runAllViaWeb();
   }
 
   /**