Wordpress 3.0.6-scripts

[autoinstalls/wordpress.git] / wp-includes / class.wp-scripts.php

diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 9fa96e9d020d5d22e3cb9039cecd9eeab7feaa84..45d2e54cb1f2891f03f69e886ad3962106d8baa7 100644 (file)
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -90,9 +90,13 @@ class WP_Scripts extends WP_Dependencies {
                if ( false === $group && in_array($handle, $this->in_footer, true) )
                        $this->in_footer = array_diff( $this->in_footer, (array) $handle );
 
                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;
+               if ( null === $this->registered[$handle]->ver )
+                       $ver = '';
+               else
+                       $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+

                if ( isset($this->args[$handle]) )
                if ( isset($this->args[$handle]) )

-                       $ver .= '&' . $this->args[$handle];
+                       $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];

 
                $src = $this->registered[$handle]->src;
 
 
                $src = $this->registered[$handle]->src;
 


@@ -114,7 +118,8 @@ class WP_Scripts extends WP_Dependencies {
                        $src = $this->base_url . $src;
                }
 
                        $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 )
                $src = esc_url(apply_filters( 'script_loader_src', $src, $handle ));
 
                if ( $this->do_concat )