From 8b571e4c81d332e0a1bac3227d40c3ebf47dadc3 Mon Sep 17 00:00:00 2001 From: Torrance Date: Tue, 14 Apr 2015 14:32:11 +1200 Subject: [PATCH] Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132. --- CRM/Core/BAO/Navigation.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php index 34e0ad4b80..5a8b84ad40 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -617,20 +617,7 @@ ORDER BY parent_id, weight"; $homeLabel = ts('CiviCRM Home'); } // Link to hide the menubar - if ( - ($config->userSystem->is_drupal) && - ((module_exists('toolbar') && user_access('access toolbar')) || - module_exists('admin_menu') && user_access('access administration menu') - ) - ) { - $hideLabel = ts('Drupal Menu'); - } - elseif ($config->userSystem->is_wordpress) { - $hideLabel = ts('WordPress Menu'); - } - else { - $hideLabel = ts('Hide Menu'); - } + $hideLabel = ts('Hide Menu'); $prepandString = "