Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14

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

diff --git a/CRM/Admin/Page/ExtensionsUpgrade.php b/CRM/Admin/Page/ExtensionsUpgrade.php
index 3c99d8a02d732110a22a1c201d636641322125cf..1c7d0d861c41fb5d7a07e5c5340fdaee46e47d10 100644 (file)
--- a/CRM/Admin/Page/ExtensionsUpgrade.php
+++ b/CRM/Admin/Page/ExtensionsUpgrade.php
@@ -10,12 +10,12 @@ class CRM_Admin_Page_ExtensionsUpgrade extends CRM_Core_Page {
   const END_URL = 'civicrm/admin/extensions';
   const END_PARAMS = 'reset=1';
 
-  function run() {
+  public function run() {
     $queue = CRM_Extension_Upgrades::createQueue();
     $runner = new CRM_Queue_Runner(array(
       'title' => ts('Database Upgrades'),
       'queue' => $queue,
-      'errorMode'=> CRM_Queue_Runner::ERROR_ABORT,
+      'errorMode' => CRM_Queue_Runner::ERROR_ABORT,
       'onEnd' => array('CRM_Admin_Page_ExtensionsUpgrade', 'onEnd'),
       'onEndUrl' => CRM_Utils_System::url(self::END_URL, self::END_PARAMS),
     ));
@@ -25,9 +25,12 @@ 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
    */
-  static function onEnd(CRM_Queue_TaskContext $ctx) {
+  public static function onEnd(CRM_Queue_TaskContext $ctx) {
     CRM_Core_Error::debug_log_message('CRM_Admin_Page_ExtensionsUpgrade: Finish upgrades');
   }
+
 }