WordPress 4.2.5-scripts

[autoinstalls/wordpress.git] / wp-admin / load-scripts.php

diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php
index 065ea9c9acd13f45cb2e18a5edbf886e37bd309a..d6ff5ad5a846ac23625b5c6327b8e862d65e91fa 100644 (file)
--- a/wp-admin/load-scripts.php
+++ b/wp-admin/load-scripts.php
@@ -3,7 +3,7 @@
 /**
  * Disable error reporting
  *
- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ * Set this to error_reporting( -1 ) for debugging.
  */
 error_reporting(0);
 
@@ -51,6 +51,11 @@ function is_lighttpd_before_150() {}
  */
 function add_action() {}
 
+/**
+ * @ignore
+ */
+function did_action() {}
+
 /**
  * @ignore
  */
@@ -109,8 +114,12 @@ function get_file($path) {
        return @file_get_contents($path);
 }
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
-$load = explode(',', $load);
+$load = $_GET['load'];
+if ( is_array( $load ) )
+       $load = implode( '', $load );
+
+$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
+$load = array_unique( explode( ',', $load ) );
 
 if ( empty($load) )
        exit;
@@ -120,7 +129,7 @@ require(ABSPATH . WPINC . '/version.php');
 
 $compress = ( isset($_GET['c']) && $_GET['c'] );
 $force_gzip = ( $compress && 'gzip' == $_GET['c'] );
-$expires_offset = 31536000;
+$expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_scripts = new WP_Scripts();
@@ -134,7 +143,7 @@ foreach( $load as $handle ) {
        $out .= get_file($path) . "\n";
 }
 
-header('Content-Type: application/x-javascript; charset=UTF-8');
+header('Content-Type: application/javascript; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");