Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-12-16-00-15

[civicrm-core.git] / CRM / Queue / Menu.php

diff --git a/CRM/Queue/Menu.php b/CRM/Queue/Menu.php
index 0cfad91a38ed47814135ca5889e920f51b40396f..a538b2d9746d77e513ef7f9f39b2132cec93f0d3 100644 (file)
--- a/CRM/Queue/Menu.php
+++ b/CRM/Queue/Menu.php
@@ -1,10 +1,9 @@
 <?php
-
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,14 +23,14 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * This file hard-codes the path entries for the queueing UI, which
  * allows us to use these paths during upgrades.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -44,10 +43,12 @@ require_once 'CRM/Core/I18n.php';
 class CRM_Queue_Menu {
 
   /**
-   * @param $path
-   * @param $menuPath
+   * @param string $path
+   *   The path for which we are trying to locate the route.
+   * @param array $menuPath
+   *   The route.
    */
-  static function alter($path, &$menuPath) {
+  public static function alter($path, &$menuPath) {
     switch ($path) {
       case 'civicrm/queue/runner':
       case 'civicrm/upgrade/queue/runner':
@@ -86,5 +87,5 @@ class CRM_Queue_Menu {
         // unrecognized
     }
   }
-}
 
+}