projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Event Cart: honor the allow_same_participant_emails setting
[civicrm-core.git]
/
CRM
/
Core
/
Menu.php
diff --git
a/CRM/Core/Menu.php
b/CRM/Core/Menu.php
index 58c9904d061f38ced85e153df7c0604f2da16671..796491120402e5ddfba89dcc2c04d6b1a7f031aa 100644
(file)
--- a/
CRM/Core/Menu.php
+++ b/
CRM/Core/Menu.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-29,7
+29,7
@@
* This file contains the various menus of the CiviCRM module
*
* @package CRM
* This file contains the various menus of the CiviCRM module
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
require_once 'CRM/Core/I18n.php';
*/
require_once 'CRM/Core/I18n.php';
@@
-44,16
+44,16
@@
class CRM_Core_Menu {
*
* @var array
*/
*
* @var array
*/
- static $_items = NULL;
+
public
static $_items = NULL;
/**
* The list of permissioned menu items.
*
* @var array
*/
/**
* The list of permissioned menu items.
*
* @var array
*/
- static $_permissionedItems = NULL;
+
public
static $_permissionedItems = NULL;
- static $_serializedElements = array(
+
public
static $_serializedElements = array(
'access_arguments',
'access_callback',
'page_arguments',
'access_arguments',
'access_callback',
'page_arguments',
@@
-61,7
+61,7
@@
class CRM_Core_Menu {
'breadcrumb',
);
'breadcrumb',
);
- static $_menuCache = NULL;
+
public
static $_menuCache = NULL;
const MENU_ITEM = 1;
/**
const MENU_ITEM = 1;
/**
@@
-367,13
+367,12
@@
class CRM_Core_Menu {
'title' => $item['title'],
'desc' => CRM_Utils_Array::value('desc', $item),
'id' => strtr($item['title'], array(
'title' => $item['title'],
'desc' => CRM_Utils_Array::value('desc', $item),
'id' => strtr($item['title'], array(
- '(' => '_',
- ')' => '',
- ' ' => '',
- ',' => '_',
- '/' => '_',
- )
- ),
+ '(' => '_',
+ ')' => '',
+ ' ' => '',
+ ',' => '_',
+ '/' => '_',
+ )),
'url' => CRM_Utils_System::url($path, $query,
FALSE,
NULL,
'url' => CRM_Utils_System::url($path, $query,
FALSE,
NULL,
@@
-570,11
+569,16
@@
class CRM_Core_Menu {
'title' => $menu[$currentPath]['title'],
'url' => CRM_Utils_System::url($currentPath,
'reset=1' . $urlVar,
'title' => $menu[$currentPath]['title'],
'url' => CRM_Utils_System::url($currentPath,
'reset=1' . $urlVar,
- FALSE, // absolute
- NULL, // fragment
- TRUE, // htmlize
- FALSE, // frontend
- TRUE // forceBackend; CRM-14439 work-around; acceptable for now because we don't display breadcrumbs on frontend
+ // absolute
+ FALSE,
+ // fragment
+ NULL,
+ // htmlize
+ TRUE,
+ // frontend
+ FALSE,
+ // forceBackend; CRM-14439 work-around; acceptable for now because we don't display breadcrumbs on frontend
+ TRUE
),
);
}
),
);
}