X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FCore%2FPaths.php;h=89b433679a90b42125d156ac864be853b0415b07;hb=95d9cb655144abe69ca3daef970f446d59cc85a2;hp=d0d15814b3671b2cf202d741ae920c083b611b05;hpb=b5b27619ebbff04079eddea91a31b42bbd8ca540;p=civicrm-core.git diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php index d0d15814b3..89b433679a 100644 --- a/Civi/Core/Paths.php +++ b/Civi/Core/Paths.php @@ -30,7 +30,10 @@ class Paths { * Class constructor. */ public function __construct() { - $paths = $this; + // Below is a *default* set of functions to calculate paths/URLs. + // Some variables may be overridden as follow: + // - The global `$civicrm_paths` may be preset before Civi boots. (Ex: via `civicrm.settings.php`, `settings.php`, or `vendor/autoload.php`) + // - Variables may be re-registered. (Ex: via `CRM_Utils_System_WordPress`) $this ->register('civicrm.root', function () { return \CRM_Core_Config::singleton()->userSystem->getCiviSourceStorage(); @@ -84,24 +87,6 @@ class Paths { 'path' => is_dir($dir) ? $dir : \Civi::paths()->getPath('[civicrm.root]/l10n'), ]; }) - ->register('wp.frontend.base', function () { - return ['url' => rtrim(CIVICRM_UF_BASEURL, '/') . '/']; - }) - ->register('wp.frontend', function () use ($paths) { - $config = \CRM_Core_Config::singleton(); - $suffix = defined('CIVICRM_UF_WP_BASEPAGE') ? CIVICRM_UF_WP_BASEPAGE : $config->wpBasePage; - return [ - 'url' => $paths->getVariable('wp.frontend.base', 'url') . $suffix, - ]; - }) - ->register('wp.backend.base', function () { - return ['url' => rtrim(CIVICRM_UF_BASEURL, '/') . '/wp-admin/']; - }) - ->register('wp.backend', function () use ($paths) { - return [ - 'url' => $paths->getVariable('wp.backend.base', 'url') . 'admin.php', - ]; - }) ->register('cms', function () { return [ 'path' => \CRM_Core_Config::singleton()->userSystem->cmsRootPath(),