Update Copywrite year to be 2019

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

diff --git a/CRM/Admin/Page/ExtensionsUpgrade.php b/CRM/Admin/Page/ExtensionsUpgrade.php
index c453e07eddd8139bcea15ef636028b4eca39de9b..b0a2a8e7ec15ea8460d88fbe12cdb4675f6e75fe 100644 (file)
--- a/CRM/Admin/Page/ExtensionsUpgrade.php
+++ b/CRM/Admin/Page/ExtensionsUpgrade.php
@@ -10,6 +10,9 @@ class CRM_Admin_Page_ExtensionsUpgrade extends CRM_Core_Page {
   const END_URL = 'civicrm/admin/extensions';
   const END_PARAMS = 'reset=1';
 
+  /**
+   * Run Page.
+   */
   public function run() {
     $queue = CRM_Extension_Upgrades::createQueue();
     $runner = new CRM_Queue_Runner(array(
@@ -17,7 +20,7 @@ class CRM_Admin_Page_ExtensionsUpgrade extends CRM_Core_Page {
       '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),
+      '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');
@@ -25,7 +28,9 @@ class CRM_Admin_Page_ExtensionsUpgrade extends CRM_Core_Page {
   }
 
   /**
-   * Handle the final step of the queue
+   * Handle the final step of the queue.
+   *
+   * @param \CRM_Queue_TaskContext $ctx
    */
   public static function onEnd(CRM_Queue_TaskContext $ctx) {
     CRM_Core_Error::debug_log_message('CRM_Admin_Page_ExtensionsUpgrade: Finish upgrades');