<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9195] sites/trunk/wordpress.org/public_html/wp-content: WordPress.org: Load Google Tag Manager through an mu-plugin rather than loading it manually in many themes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9195">9195</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9195","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-17 05:16:38 +0000 (Thu, 17 Oct 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordPress.org: Load Google Tag Manager through an mu-plugin rather than loading it manually in many themes.
See <a href="http://meta.trac.wordpress.org/ticket/4625">#4625</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfrontpagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/front-page.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginheaderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadcounterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-counter.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporggoogletagmanagerphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-google-tag-manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporggoogletagmanagerphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-google-tag-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-google-tag-manager.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-google-tag-manager.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,42 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin\GoogleTagManager;
+
+/**
+ * Plugin Name: WordPress.org Google Tag Manager.
+ */
+
+/**
+ * Output the <head> tags.
+ */
+function wp_head() {
+ ?>
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-P24PF4B');</script>
+ <?php
+}
+add_action( 'wp_head', __NAMESPACE__ . '\wp_head', 5 );
+add_action( 'login_head', __NAMESPACE__ . '\wp_head', 5 );
+
+/**
+ * Output the no-js variant.
+ */
+function wp_body_open() {
+ ?>
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-P24PF4B" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+ <?php
+}
+add_action( 'wp_body_open', __NAMESPACE__ . '\wp_body_open' );
+
+/**
+ * Add a dns-prefetch for the tag manager hostname.
+ */
+function wp_resource_hints( $uris, $type ) {
+ if ( 'dns-prefetch' === $type ) {
+ $uris[] = '//www.googletagmanager.com';
+ }
+ return $uris;
+}
+add_filter( 'wp_resource_hints', __NAMESPACE__ . '\wp_resource_hints', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-google-tag-manager.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfrontpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/front-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/front-page.php 2019-10-16 15:02:05 UTC (rev 9194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/front-page.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <body <?php body_class( 'folded' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-P24PF4B" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_body_open(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="gutenberg">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="editor" class="gutenberg__editor"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php 2019-10-16 15:02:05 UTC (rev 9194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,21 +1028,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'o2_filter_post_actions', array( 'Gutenberg_Handbook', 'redirect_o2_edit_link_to_github' ), 11, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'handbook_display_toc', '__return_false' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/**
- * Output the GoogleTagManager <head> tags.
- */
-function wporg_gutenberg_gtm() {
- ?>
-
- <link rel="dns-prefetch" href="//www.googletagmanager.com">
-
- <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
- new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
- j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
- 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
- })(window,document,'script','dataLayer','GTM-P24PF4B');</script>
-
- <?php
-}
-add_action( 'wp_head', 'wporg_gutenberg_gtm' );
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2019-10-16 15:02:05 UTC (rev 9194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,29 +132,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wporg_login_register_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Output the GoogleTagManager <head> tags.
- */
-function wporg_login_gtm() {
- ?>
- <link rel="dns-prefetch" href="//www.googletagmanager.com">
-
- <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
- new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
- j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
- 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
- })(window,document,'script','dataLayer','GTM-P24PF4B');</script>
- <?php
-}
-add_action( 'wp_head', 'wporg_login_gtm' );
-add_action( 'login_head', 'wporg_login_gtm' );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * wp_die() handler for login.wordpress.org, adds GTM to error pages.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_login_die_handler( $message, $title = '', $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_string( $message ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $message ) && is_callable( '\WordPressdotorg\Plugin\GoogleTagManager\wp_head' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wporg_login_gtm();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ \WordPressdotorg\Plugin\GoogleTagManager\wp_head();
+ \WordPressdotorg\Plugin\GoogleTagManager\wp_body_open();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $gtm = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $gtm . $message;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php 2019-10-16 15:02:05 UTC (rev 9194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body <?php body_class( 'wp-core-ui login no-js' ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">document.body.className = document.body.className.replace('no-js','js');</script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-P24PF4B" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wp_body_open(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="login">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><a href="https://wordpress.org/" title="WordPress.org" tabindex="-1"><?php _e( 'WordPress.org Login', 'wporg' ); ?></a></h1>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadcounterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-counter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-counter.php 2019-10-16 15:02:05 UTC (rev 9194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-counter.php 2019-10-17 05:16:38 UTC (rev 9195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,6 +66,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $num )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Remove some headers we don't need:
+remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
+remove_action( 'wp_head', 'wp_print_styles', 8 );
+remove_action( 'wp_head', 'wp_print_head_scripts', 9 );
+remove_action( 'wp_head', '_admin_bar_bump_cb' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,13 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <link href="//fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet" type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="canonical" href="<?php echo esc_url( $canonical_url ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <link rel="dns-prefetch" href="//www.googletagmanager.com">
</del><span class="cx" style="display: block; padding: 0 10px"> <meta name="description" content="<?php echo esc_attr( $meta_desc_text ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-P24PF4B');</script>
</del><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> html,
</span><span class="cx" style="display: block; padding: 0 10px"> body {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,10 +214,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_head(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <body>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-P24PF4B" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_body_open(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="something-semantic">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="something-else-semantic">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="counter-inner">
</span></span></pre>
</div>
</div>
</body>
</html>