Changeset 13185

Timestamp:

02/07/2024 06:18:36 AM (22 months ago)

Author:

dd32

Message:

Trac: Properly encode & in urls, follow up to [13183].

Location:

sites/trunk/trac.wordpress.org/templates

Files:

• update-headers.php (modified) (1 diff)
• wporg-footer.html (modified) (1 diff)
• wporg-head.html (modified) (2 diffs)

sites/trunk/trac.wordpress.org/templates/update-headers.php

@@ -94 +94 @@
             $hash = md5( file_get_contents( $m['url'] ) );
 
-            if ( preg_match( '/([?&](ver)=[^&]+)/i', $url, $m ) ) {
+            if ( preg_match( '/([?&;](ver)=[^&]+)/i', $url, $m ) ) {
                 $url = str_replace( $m[0], $m[0] . '-' . $hash, $url );
             } else {
-                $url .= ( str_contains( $url, '?' ) ? '&' : '?' ) . 'ver=' . $hash;
+                $url .= ( str_contains( $url, '?' ) ? '&' : '?' ) . 'ver=' . $hash;
             }
 

sites/trunk/trac.wordpress.org/templates/wporg-footer.html

@@ -64 +64 @@
         </figure>
     </div>
-</footer><script src="https://s.w.org/wp-content/plugins/jetpack/jetpack_vendor/automattic/jetpack-image-cdn/dist/image-cdn.js?minify=false&amp;ver=132249e245926ae3e188&ver=328b8123661abdd5f4a0c695e7aa9dcc" id="jetpack-photon-js"/>
+</footer><script src="https://s.w.org/wp-content/plugins/jetpack/jetpack_vendor/automattic/jetpack-image-cdn/dist/image-cdn.js?minify=false&amp;ver=132249e245926ae3e188-328b8123661abdd5f4a0c695e7aa9dcc" id="jetpack-photon-js"/>
 <script src="https://s.w.org/wp-content/mu-plugins/pub-sync/blocks/time/build/view.js?ver=362338b9e6592dcf125b-a151adfd0189fb7dec51fde02a33867f" id="wporg-time-view-script-js" defer="defer" data-wp-strategy="defer"/>
 <script id="wporg-global-header-script-js-extra">//<![CDATA[
 var wporgGlobalHeaderI18n = {"openSearchLabel":"Open Search","closeSearchLabel":"Close Search","overflowMenuLabel":"More menu"};
 //]]></script>
-<script src="https://s.w.org/wp-content/mu-plugins/pub-sync/blocks/global-header-footer/js/view.js?ver=1697687345-36745cfaa0bf36ff5a11ff34834a5378" id="wporg-global-header-script-js"/>
+<script src="https://s.w.org/wp-content/mu-plugins/pub-sync/blocks/global-header-footer/js/view.js?ver=1697687539-36745cfaa0bf36ff5a11ff34834a5378" id="wporg-global-header-script-js"/>
     </html>

sites/trunk/trac.wordpress.org/templates/wporg-head.html

@@ -32 +32 @@
 </style>
 <link rel="stylesheet" id="open-sans-css" href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;1,300;1,400;1,600&amp;display=swap" media="all"/>
-<link rel="stylesheet" id="wp4-styles-css" href="https://s.w.org/style/wp4.css?ver=1645139155" media="all"/>
+<link rel="stylesheet" id="wp4-styles-css" href="https://s.w.org/style/wp4.css?ver=1645139188" media="all"/>
 <style id="wp-emoji-styles-inline-css">
     img.wp-smiley, img.emoji {
@@ -258 +258 @@
 .wp-container-core-navigation-is-layout-2.wp-container-core-navigation-is-layout-2{flex-direction:column;align-items:flex-start;}
 </style>
-<link rel="stylesheet" id="wporg-global-fonts-css" href="https://s.w.org/wp-content/mu-plugins/pub-sync/global-fonts/style.css?ver=1700434948-d6228079937fbf30cfb38ae89bd881d5" media="all"/>
-<link rel="stylesheet" id="wporg-global-header-footer-css" href="https://s.w.org/wp-content/mu-plugins/pub-sync/blocks/global-header-footer/build/style.css?ver=1706749311-3b988c8838ef7d6789c20ca32d48bed3" media="all"/>
+<link rel="stylesheet" id="wporg-global-fonts-css" href="https://s.w.org/wp-content/mu-plugins/pub-sync/global-fonts/style.css?ver=1700435029-d6228079937fbf30cfb38ae89bd881d5" media="all"/>
+<link rel="stylesheet" id="wporg-global-header-footer-css" href="https://s.w.org/wp-content/mu-plugins/pub-sync/blocks/global-header-footer/build/style.css?ver=1706749364-3b988c8838ef7d6789c20ca32d48bed3" media="all"/>
 <link rel="stylesheet" id="jetpack_css-css" href="https://s.w.org/wp-content/plugins/jetpack/css/jetpack.css?ver=12.9.3-af06e42ba998be5b755ccfa57836b1a5" media="all"/>
 <script id="wp-load-polyfill-importmap">//<![CDATA[