Changeset 12558

Timestamp:

12/28/2009 12:48:20 AM (14 years ago)

Author:

azaozz

Message:

WP_Dependencies: pass NULL to disable script and style version query strings, props scribu amattie, fixes #11315

Location:

trunk/wp-includes

Files:

• class.wp-dependencies.php (modified) (1 diff)
• class.wp-scripts.php (modified) (2 diffs)
• class.wp-styles.php (modified) (2 diffs)
• functions.wp-scripts.php (modified) (3 diffs)
• functions.wp-styles.php (modified) (2 diffs)

trunk/wp-includes/class.wp-dependencies.php

@@ -233 +233 @@
         if ( !is_array($this->deps) )
             $this->deps = array();
-        if ( !$this->ver )
-            $this->ver = false;
     }
 

trunk/wp-includes/class.wp-scripts.php

@@ -91 +91 @@
             $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]) )
-            $ver .= '&' . $this->args[$handle];
+            $ver = $ver ? $ver . '&' . $this->args[$handle] : '?' . $this->args[$handle];
 
         $src = $this->registered[$handle]->src;
@@ -115 +119 @@
         }
 
-        $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 ));
 

trunk/wp-includes/class.wp-styles.php

@@ -36 +36 @@
             return false;
 
-        $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]) )
-            $ver .= '&' . $this->args[$handle];
+            $ver = $ver ? $ver . '&' . $this->args[$handle] : '?' . $this->args[$handle];
 
         if ( $this->do_concat ) {
@@ -101 +105 @@
         }
 
-        $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 );

trunk/wp-includes/functions.wp-scripts.php

@@ -39 +39 @@
  *
  * @since r16
- * @see WP_Dependencies::add() For parameter information.
+ * @param string $handle Script name
+ * @param string $src Script url
+ * @param array $deps (optional) Array of script names on which this script depends
+ * @param string|bool $ver (optional) Script version (used for cache busting), set to NULL to disable
+ * @param bool (optional) Wether to enqueue the script before </head> or before </body>
+ * @return null
  */
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
@@ -57 +62 @@
  *
  * @since r16
- * @see WP_Script::localize()
+ * @see WP_Scripts::localize()
  */
 function wp_localize_script( $handle, $object_name, $l10n ) {
@@ -87 +92 @@
  *
  * @since r16
- * @see WP_Script::add(), WP_Script::enqueue()
-*/
+ * @see wp_register_script() For parameter information.
+ */
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
     global $wp_scripts;

trunk/wp-includes/functions.wp-styles.php

@@ -46 +46 @@
  * @param array $deps Array of handles of any stylesheet that this stylesheet depends on.
  *  (Stylesheets that must be loaded before this stylesheet.) Pass an empty array if there are no dependencies.
- * @param string|bool $ver String specifying the stylesheet version number, if it has one. This parameter
- *  is used to ensure that the correct version is sent to the client regardless of caching, and so should be included
- *  if a version number is available and makes sense for the stylesheet.
+ * @param string|bool $ver String specifying the stylesheet version number. Set to NULL to disable.
+ *  Used to ensure that the correct version is sent to the client regardless of caching.
  * @param string $media The media for which this stylesheet has been defined.
  */
@@ -78 +77 @@
 /**
  * Enqueue a CSS style file.
+ *
+ * Registers the style if src provided (does NOT overwrite) and enqueues.
  *
  * @since r79