From 9f1588f94ab3f6ac0560eae305c51b10fb5632aa Mon Sep 17 00:00:00 2001 From: David Snopek Date: Tue, 8 Aug 2017 16:08:17 -0500 Subject: [PATCH] Revert usage of dirname()'s 2nd argument to support PHP version used by Jenkins --- CRM/Core/ClassLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/ClassLoader.php b/CRM/Core/ClassLoader.php index 98bcdc82ff..9b69635426 100644 --- a/CRM/Core/ClassLoader.php +++ b/CRM/Core/ClassLoader.php @@ -101,8 +101,8 @@ class CRM_Core_ClassLoader { // civicrm-core directory. However, if civicrm-core was installed via // composer as a library, that'll be 5 directories up where composer was // run (ex. the Drupal root on a Drupal 8 site). - $civicrm_base_path = dirname(__DIR__, 2); - $top_path = dirname(__DIR__, 5); + $civicrm_base_path = dirname(dirname(__DIR__)); + $top_path = dirname(dirname(dirname(dirname(dirname(__DIR__))))); if (file_exists($civicrm_base_path . '/vendor/autoload.php')) { require_once $civicrm_base_path . '/vendor/autoload.php'; -- 2.25.1