From 254825102cec74c5679ba6dc56bc4ab1a3d883b7 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Wed, 13 Mar 2013 10:38:36 -0700 Subject: [PATCH] CRM-12111 --- CRM/Core/BAO/Navigation.php | 5 ++--- CRM/PCP/Form/PCPAccount.php | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php index d96e3fa96b..a17438d5e5 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -571,9 +571,8 @@ ORDER BY parent_id, weight"; static function createNavigation($contactID) { $config = CRM_Core_Config::singleton(); - // For Joomla front end user, there is no need to create - // navigation menu items, CRM-5349 - if ($config->userFramework == 'Joomla' && $config->userFrameworkFrontend) { + // if on frontend, do not create navigation menu items, CRM-5349 + if ($config->userFrameworkFrontend) { return ""; } diff --git a/CRM/PCP/Form/PCPAccount.php b/CRM/PCP/Form/PCPAccount.php index 771d18e239..a8b107d1d5 100644 --- a/CRM/PCP/Form/PCPAccount.php +++ b/CRM/PCP/Form/PCPAccount.php @@ -64,7 +64,7 @@ class CRM_PCP_Form_PCPAccount extends CRM_Core_Form { $this->_component = CRM_Utils_Request::retrieve('component', 'String', $this); $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this); - if (!$this->_pageId && $config->userFramework == 'Joomla' && $config->userFrameworkFrontend) { + if (!$this->_pageId && $config->userFrameworkFrontend) { $this->_pageId = $this->_id; } @@ -135,12 +135,12 @@ class CRM_PCP_Form_PCPAccount extends CRM_Core_Form { $stateCountryMap[$index][$fieldName] = $name; } - // also take care of state country widget + // also take care of state country widget if (!empty($stateCountryMap)) { CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap, $this->_defaults); } } - // now fix all state country selectors + // now fix all state country selectors CRM_Core_BAO_Address::fixAllStateSelects($this, $this->_defaults); return $this->_defaults; } -- 2.25.1