Ticket #22757: 22757.2.2.diff

wp-includes/script-loader.php

@@ -689 +689 @@
         if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
                 $zip = 'gzip';
 
-        if ( !empty($wp_scripts->concat) ) {
+        if ( ! empty( $wp_scripts->concat ) ) {
 
-                if ( !empty($wp_scripts->print_code) ) {
+                if ( ! empty( $wp_scripts->print_code ) ) {
                         echo "\n<script type='text/javascript'>\n";
                         echo "/* <![CDATA[ */\n"; // not needed in HTML 5
                         echo $wp_scripts->print_code;
@@ -699 +699 @@
                         echo "</script>\n";
                 }
 
-                $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . trim($wp_scripts->concat, ', ') . '&ver=' . $wp_scripts->default_version;
-                echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+                while( strlen( trim( $wp_scripts->concat, ', ' ) ) > 500 ) {
+                        $index = strrpos( $wp_scripts->concat, ',', 500 );
+                        $segment = substr( $wp_scripts->concat, 0, $index );
+                        $wp_scripts->concat = substr( $wp_scripts->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}&load=" . trim( $wp_scripts->concat, ', ' ) . '&ver=' . $wp_scripts->default_version;
+                echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
         }
 
         if ( !empty($wp_scripts->print_html) )