Skip to content

Issue 27: Eliminate undefined variable warning #28

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
bugfolder wants to merge 1 commit into
base: 1.x-2.x
Choose a base branch
from
Open

Issue 27: Eliminate undefined variable warning #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions googleanalytics.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ function googleanalytics_preprocess_layout() {
}
$custom_var .= 'gtag("event", "custom", ' . backdrop_json_encode($custom_vars) . ');';
};

// Build tracker code.
$script = 'window.dataLayer = window.dataLayer || [];';
$script .= 'function gtag(){dataLayer.push(arguments)};';
Expand All @@ -281,7 +281,7 @@ function googleanalytics_preprocess_layout() {

// Build the arguments fields list.
// https://developers.google.com/analytics/devguides/collection/gtagjs/sending-data
$create_only_fields = array_merge($create_only_fields, $codesnippet_create);
$create_only_fields = $codesnippet_create;

// Domain tracking type.
global $cookie_domain;
Expand Down Expand Up @@ -316,7 +316,7 @@ function googleanalytics_preprocess_layout() {
if (variable_get('googleanalytics_tracker_anonymizeip', 1)) {
$create_only_fields['anonymize_ip'] = TRUE;
}

if (!empty($url_custom)) {
$create_only_fields['page_path'] = 'PLACEHOLDER_URL_CUSTOM';
}
Expand All @@ -337,7 +337,7 @@ function googleanalytics_preprocess_layout() {
$arguments_json = backdrop_json_encode($create_only_fields);
// backdrop_json_encode() cannot convert every data type properly.
$arguments_json = str_replace('"PLACEHOLDER_URL_CUSTOM"', $url_custom, $arguments_json);

// Create a tracker.
if (!empty($codesnippet_before)) {
$script .= $codesnippet_before;
Expand All @@ -348,7 +348,7 @@ function googleanalytics_preprocess_layout() {

// Prepare Adsense tracking.
$googleanalytics_adsense_script .= 'window.google_analytics_uacct = ' . backdrop_json_encode($id_list[0]) . ';';

if (!empty($custom_var)) {
$script .= $custom_var;
}
Expand Down