Ticket #22899: 22899.diff

wp-includes/script-loader.php

@@ -699 +699 @@
                         echo "</script>\n";
                 }
 
-                $concat = str_split( $concat, 128 );
-                $concat = 'load[]=' . implode( '&load[]=', $concat );
+                while( strlen( trim( $concat, ', ' ) ) > 500 ) {
+                        $index = strrpos( $concat, ',', 500 );
+                        $segment = substr( $concat, 0, $index );
+                        $concat = substr( $concat, $index );
+                        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . trim( $segment, ', ' ) . '&ver=' . $wp_scripts->default_version;
+                        echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
+                }
 
-                $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
-                echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+                $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . trim( $concat, ', ' ) . '&ver=' . $wp_scripts->default_version;
+                echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
         }
 
         if ( !empty($wp_scripts->print_html) )

wp-admin/load-scripts.php

@@ -114 +114 @@
         return @file_get_contents($path);
 }
 
-$load = $_GET['load'];
-if ( is_array( $load ) )
-        $load = implode( '', $load );
+$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
+$load = explode( ',', $load );
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
-$load = explode(',', $load);
-
 if ( empty($load) )
         exit;