diff --git a/lib/ProductOpener/Config_obf.pm b/lib/ProductOpener/Config_obf.pm index 86addf91a26c0..f6ac4522eefbd 100644 --- a/lib/ProductOpener/Config_obf.pm +++ b/lib/ProductOpener/Config_obf.pm @@ -70,7 +70,7 @@ BEGIN { $memd_servers - $google_analytics + $analytics $thumb_size $crop_size @@ -270,7 +270,27 @@ $small_size = 200; $display_size = 400; $zoom_size = 800; -$google_analytics = < + + HTML ; diff --git a/lib/ProductOpener/Config_off.pm b/lib/ProductOpener/Config_off.pm index 2e0fc1dc5e946..1791e14b26f30 100644 --- a/lib/ProductOpener/Config_off.pm +++ b/lib/ProductOpener/Config_off.pm @@ -70,7 +70,7 @@ BEGIN { $memd_servers - $google_analytics + $analytics $thumb_size $crop_size @@ -485,7 +485,7 @@ $small_size = 200; $display_size = 400; $zoom_size = 800; -$google_analytics = < + HTML ; diff --git a/lib/ProductOpener/Config_opff.pm b/lib/ProductOpener/Config_opff.pm index 02554b1b19f63..2d8b1d44640a1 100644 --- a/lib/ProductOpener/Config_opff.pm +++ b/lib/ProductOpener/Config_opff.pm @@ -69,7 +69,7 @@ BEGIN { $memd_servers - $google_analytics + $analytics $thumb_size $crop_size @@ -270,7 +270,27 @@ $small_size = 200; $display_size = 400; $zoom_size = 800; -$google_analytics = < + + HTML ; diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm index a2e9b65754ddf..f9ac54dba4106 100644 --- a/lib/ProductOpener/Display.pm +++ b/lib/ProductOpener/Display.pm @@ -7483,15 +7483,8 @@ sub display_page ($request_ref) { $site_name .= " - " . lang_in_other_lc($request_lc, "producers_platform"); } - # Override Google Analytics from Config.pm with server_options - # defined in Config2.pm if it exists - - if (exists $server_options{google_analytics}) { - $google_analytics = $server_options{google_analytics}; - } - $template_data_ref->{styles} = $request_ref->{styles}; - $template_data_ref->{google_analytics} = $google_analytics; + $template_data_ref->{analytics} = $analytics; $template_data_ref->{bodyabout} = $request_ref->{bodyabout}; $template_data_ref->{site_name} = $site_name; diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html index f36e0b2e6d452..37610d504a17a 100644 --- a/templates/web/common/site_layout.tt.html +++ b/templates/web/common/site_layout.tt.html @@ -26,7 +26,7 @@ [% lang("css") %] [% styles %] - [% google_analytics %] + [% analytics %]