Changeset 45456

Timestamp:

05/28/2019 02:42:24 AM (6 years ago)

Author:

azaozz

Message:

Script loader: prevent sorting of the load array in the query string when passing the script handles to load-scripts.php and load-styles.php.

Fixes #45346 #26886.

Location:

trunk/src

Files:

• wp-admin/load-scripts.php (modified) (1 diff)
• wp-admin/load-styles.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-admin/load-scripts.php

@@ -17 +17 @@
 $load = $_GET['load'];
 if ( is_array( $load ) ) {
+    ksort( $load );
     $load = implode( '', $load );
 }

trunk/src/wp-admin/load-styles.php

@@ -21 +21 @@
 $load = $_GET['load'];
 if ( is_array( $load ) ) {
+    ksort( $load );
     $load = implode( '', $load );
 }
+
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );

trunk/src/wp-includes/script-loader.php

@@ -2462 +2462 @@
 
         $concat = str_split( $concat, 128 );
-        $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
-
-        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
+        $concatenated = '';
+
+        foreach ( $concat as $key => $chunk ) {
+            $concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
+        }
+
+        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}" . $concatenated . '&ver=' . $wp_scripts->default_version;
         echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
     }
@@ -2632 +2636 @@
 
         $concat = str_split( $concat, 128 );
-        $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
-
-        $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
+        $concatenated = '';
+
+        foreach ( $concat as $key => $chunk ) {
+            $concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
+        }
+
+        $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}" . $concatenated . '&ver=' . $ver;
         echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "' type='text/css' media='all' />\n";