Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132.
authorTorrance <torrance123@gmail.com>
Tue, 14 Apr 2015 02:32:11 +0000 (14:32 +1200)
committerTorrance <torrance123@gmail.com>
Tue, 14 Apr 2015 02:32:11 +0000 (14:32 +1200)
CRM/Core/BAO/Navigation.php

index 34e0ad4b80e77663b4c7c07769014b5a93f42d9e..5a8b84ad40d046fb9560ae0df3c217fa0f90f69f 100644 (file)
@@ -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 = "
         <li class='menumain crm-link-home'>$homeIcon