Ticket #11315: 11315_override.diff

wp-includes/functions.wp-scripts.php

@@ -40 +40 @@
  * @since r16
  * @see WP_Dependencies::add() For parameter information.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_register_script( $handle, $src, $deps = array(), $ver = null, $in_footer = false ) {
         global $wp_scripts;
         if ( !is_a($wp_scripts, 'WP_Scripts') )
                 $wp_scripts = new WP_Scripts();
@@ -88 +88 @@
  * @since r16
  * @see WP_Script::add(), WP_Script::enqueue()
 */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = null, $in_footer = false ) {
         global $wp_scripts;
         if ( !is_a($wp_scripts, 'WP_Scripts') )
                 $wp_scripts = new WP_Scripts();

wp-includes/class.wp-styles.php

@@ -35 +35 @@
                 if ( !parent::do_item($handle) )
                         return false;
 
-                $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+                $ver = $this->registered[$handle]->ver !== null ? $this->registered[$handle]->ver : $this->default_version;
                 if ( isset($this->args[$handle]) )
                         $ver .= '&' . $this->args[$handle];
 
@@ -100 +100 @@
                         $src = $this->base_url . $src;
                 }
 
-                $src = add_query_arg('ver', $ver, $src);
+                if (!empty($ver))
+                        $src = add_query_arg('ver', $ver, $src);
                 $src = apply_filters( 'style_loader_src', $src, $handle );
                 return esc_url( $src );
         }

wp-includes/functions.wp-styles.php

@@ -38 +38 @@
  * @since r79
  * @see WP_Styles::add() For parameter and additional information.
  */
-function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
+function wp_register_style( $handle, $src, $deps = array(), $ver = null, $media = 'all' ) {
         global $wp_styles;
         if ( !is_a($wp_styles, 'WP_Styles') )
                 $wp_styles = new WP_Styles();
@@ -66 +66 @@
  * @since r79
  * @see WP_Styles::add(), WP_Styles::enqueue()
  */
-function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = false ) {
+function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = null, $media = false ) {
         global $wp_styles;
         if ( !is_a($wp_styles, 'WP_Styles') )
                 $wp_styles = new WP_Styles();

wp-includes/class.wp-dependencies.php

@@ -232 +232 @@
                 @list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
                 if ( !is_array($this->deps) )
                         $this->deps = array();
-                if ( !$this->ver )
-                        $this->ver = false;
         }
 
         function add_data( $name, $data ) {

wp-includes/class.wp-scripts.php

@@ -90 +90 @@
                 if ( false === $group && in_array($handle, $this->in_footer, true) )
                         $this->in_footer = array_diff( $this->in_footer, (array) $handle );
 
-                $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+                $ver = $this->registered[$handle]->ver !== null ? $this->registered[$handle]->ver : $this->default_version;
+
                 if ( isset($this->args[$handle]) )
                         $ver .= '&' . $this->args[$handle];
 
@@ -114 +115 @@
                         $src = $this->base_url . $src;
                 }
 
-                $src = add_query_arg('ver', $ver, $src);
+                if (!empty($ver))
+                        $src = add_query_arg('ver', $ver, $src);
                 $src = esc_url(apply_filters( 'script_loader_src', $src, $handle ));
 
                 if ( $this->do_concat )