From 624142d453ccf51d6bd5f8fc57e44a9b34c5f2b7 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 1 Oct 2014 11:57:01 +1300 Subject: [PATCH] CRM-15297 - move default block to d8 class as default in base class is 'left' (NB defaultBlockLocation may be drupal specific & not really belong in baseclass --- CRM/Utils/System/Drupal8.php | 10 ++++++++++ CRM/Utils/System/DrupalBase.php | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php index 57d3f919f2..5f9a2ab8e8 100644 --- a/CRM/Utils/System/Drupal8.php +++ b/CRM/Utils/System/Drupal8.php @@ -628,4 +628,14 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase { return $id; } } + + /** + * Get the default location for CiviCRM blocks + * + * @return string + * + */ + function getDefaultBlockLocation() { + return 'sidebar_first'; + } } diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php index 71f154d015..5872840455 100644 --- a/CRM/Utils/System/DrupalBase.php +++ b/CRM/Utils/System/DrupalBase.php @@ -420,15 +420,6 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base { menu_rebuild(); } - /** - * Get the default location for CiviCRM blocks - * - * @return string - * - */ - function getDefaultBlockLocation() { - return 'sidebar_first'; - } /** * Get the locale set in the hosting CMS * -- 2.25.1