Ticket #45346: 45346.diff

src/wp-admin/load-scripts.php

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

src/wp-admin/load-styles.php

@@ -20 +20 @@
 
 $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 ) );
 

src/wp-includes/script-loader.php

@@ -2459 +2459 @@
                 }
 
                 $concat = str_split( $concat, 128 );
-                $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+                $concatenated = '';
 
-                $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
+                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";
         }
 
@@ -2629 +2633 @@
                 $ver = $wp_styles->default_version;
 
                 $concat = str_split( $concat, 128 );
-                $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+                $concatenated = '';
 
-                $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
+                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";
 
                 if ( ! empty( $wp_styles->print_code ) ) {