diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 6e25039..c3dfd04 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -3002,7 +3002,10 @@ function _current_path($path = NULL) { * @see request_path() */ function current_path() { - return drupal_container()->get('request')->attributes->get('system_path'); + if (drupal_container()->isScopeActive('request')) { + return drupal_container()->get('request')->attributes->get('system_path'); + } + return _current_path(); } /**