projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4004 from civicrm/4.4
[civicrm-core.git]
/
CRM
/
Admin
/
Form
/
Navigation.php
diff --git
a/CRM/Admin/Form/Navigation.php
b/CRM/Admin/Form/Navigation.php
index 0fa247c30c4852555a45dec138492abcd7b14f4e..dd0b6199a9596aa39fb17cb799256f3180f683a5 100644
(file)
--- a/
CRM/Admin/Form/Navigation.php
+++ b/
CRM/Admin/Form/Navigation.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-52,7
+52,7
@@
class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
/**
* Function to build the form
*
/**
* Function to build the form
*
- * @return
None
+ * @return
void
* @access public
*/
public function buildQuickForm() {
* @access public
*/
public function buildQuickForm() {
@@
-116,10
+116,13
@@
class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
}
}
}
}
+ /**
+ * @return array
+ */
public function setDefaultValues() {
$defaults = $this->_defaults;
if (isset($this->_id)) {
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;
}
foreach (explode(',', $this->_defaults['permission']) as $value) {
$components[$value] = $value;
}
@@
-144,7
+147,7
@@
class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
*
* @access public
*
*
* @access public
*
- * @return
None
+ * @return
void
*/
public function postProcess() {
// get the submitted form values.
*/
public function postProcess() {
// get the submitted form values.