Skip to content

More D9 fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
longwave wants to merge 2 commits into
base: CMS-2193-update-d9
Choose a base branch
from
Open

More D9 fixes #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2265a39
Replace Unicode::strtolower() with mb_strtolower().
longwave Feb 3, 2022
60b3027
Replace path.alias_manager with path_alias.manager.
longwave Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions google_tag.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,20 +231,20 @@ function _google_tag_path_check() {
if (!isset($satisfied)) {
$config = \Drupal::config('google_tag.settings');
$toggle = $config->get('path_toggle');
$paths = Unicode::strtolower($config->get('path_list'));
$paths = mb_strtolower($config->get('path_list'));

if (empty($paths)) {
$satisfied = ($toggle == GOOGLE_TAG_EXCLUDE_LISTED);
}
else {
$request = \Drupal::request();
$current_path = \Drupal::service('path.current');
$alias_manager = \Drupal::service('path.alias_manager');
$alias_manager = \Drupal::service('path_alias.manager');
$path_matcher = \Drupal::service('path.matcher');
// @todo Are not some paths case sensitive???
// Compare the lowercase path alias (if any) and internal path.
$path = rtrim($current_path->getPath($request), '/');
$path_alias = Unicode::strtolower($alias_manager->getAliasByPath($path));
$path_alias = mb_strtolower($alias_manager->getAliasByPath($path));
$satisfied = $path_matcher->matchPath($path_alias, $paths) || (($path != $path_alias) && $path_matcher->matchPath($path, $paths));
$satisfied = ($toggle == GOOGLE_TAG_EXCLUDE_LISTED) ? !$satisfied : $satisfied;
}
Expand Down