CRM-19372 allow payment processors to define an array of accepted credit card types

[civicrm-core.git] / CRM / Core / Action.php

diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index 32e2ec43345fbc41fc127e4d94f894d93b35b7d0..3ef5dc89bf8c75a28966ce1188a255395eb1404d 100644 (file)
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -31,7 +31,7 @@
  * and similar across all objects (thus providing both reuse and standards)
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -171,7 +171,7 @@ class CRM_Core_Action {
    *   the corresponding action description
    */
   public static function description($mask) {
-    if (!isset($_description)) {
+    if (!isset(self::$_description)) {
       self::$_description = array_flip(self::$_names);
     }
 
@@ -210,7 +210,6 @@ class CRM_Core_Action {
     $objectName = NULL,
     $objectId = NULL
   ) {
-    $config = CRM_Core_Config::singleton();
     if (empty($links)) {
       return NULL;
     }
@@ -321,8 +320,10 @@ class CRM_Core_Action {
   /**
    * Get the mask for a permission (view, edit or null)
    *
+   * @param array $permissions
+   *
    * @return int
-   *   the mask for the above permission
+   *   The mask for the above permission
    */
   public static function mask($permissions) {
     $mask = NULL;