CRM-12882 - Allow all admins to view payment processors page. Clarify error message...

[civicrm-core.git] / CRM / Admin / Form / Navigation.php

diff --git a/CRM/Admin/Form/Navigation.php b/CRM/Admin/Form/Navigation.php
index 1275b77bc44b4705168592c2efda6065c788b7dd..40db24cb8322e20682e7a283b39d616152f701c1 100644 (file)
--- a/CRM/Admin/Form/Navigation.php
+++ b/CRM/Admin/Form/Navigation.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -52,7 +52,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
@@ -119,7 +119,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
   public function setDefaultValues() {
     $defaults = $this->_defaults;
     if (isset($this->_id)) {
-      if (CRM_Utils_Array::value('permission', $this->_defaults)) {
+      if (!empty($this->_defaults['permission'])) {
         foreach (explode(',', $this->_defaults['permission']) as $value) {
           $components[$value] = $value;
         }
@@ -144,7 +144,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   public function postProcess() {
     // get the submitted form values.