Changeset 32623

Timestamp:

05/27/2015 07:33:41 PM (9 years ago)

Author:

wonderboymusic

Message:

Add missing doc blocks to script-loader.php.
Use wp_styles() and wp_scripts() where appropriate.

See #32444.

File:

• trunk/src/wp-includes/script-loader.php (modified) (12 diffs)

trunk/src/wp-includes/script-loader.php

@@ -46 +46 @@
  * @since 2.6.0
  *
- * @param object $scripts WP_Scripts object.
+ * @param WP_Scripts $scripts WP_Scripts object.
  */
 function wp_default_scripts( &$scripts ) {
@@ -609 +609 @@
  * @since 2.6.0
  *
- * @param object $styles
+ * @param WP_Styles $styles
  */
 function wp_default_styles( &$styles ) {
@@ -767 +767 @@
  *
  * @since 2.6.0
- * @uses $_wp_admin_css_colors
- *
- * @param string $src Source URL.
+ * @global array $_wp_admin_css_colors
+ *
+ * @param string $src    Source URL.
  * @param string $handle Either 'colors' or 'colors-rtl'.
- * @return string URL path to CSS stylesheet for Administration Screens.
+ * @return string|false URL path to CSS stylesheet for Administration Screens.
  */
 function wp_style_loader_src( $src, $handle ) {
@@ -813 +813 @@
  *
  * @see wp_print_scripts()
+ *
+ * @global bool $concatenate_scripts
+ *
+ * @return array
  */
 function print_head_scripts() {
-    global $wp_scripts, $concatenate_scripts;
+    global $concatenate_scripts;
 
     if ( ! did_action('wp_print_scripts') ) {
@@ -822 +826 @@
     }
 
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        $wp_scripts = new WP_Scripts();
-    }
+    $wp_scripts = wp_scripts();
 
     script_concat_settings();
@@ -849 +851 @@
  *
  * @since 2.8.0
+ *
+ * @global WP_Scripts $wp_scripts
+ * @global bool       $concatenate_scripts
+ *
+ * @return array
  */
 function print_footer_scripts() {
@@ -879 +886 @@
  *
  * @ignore
+ *
+ * @global WP_Scripts $wp_scripts
+ * @global bool       $compress_scripts
  */
 function _print_scripts() {
@@ -915 +925 @@
  *
  * @since 2.8.0
+ *
+ * @global WP_Scripts $wp_scripts
+ *
+ * @return array
  */
 function wp_print_head_scripts() {
@@ -975 +989 @@
  *
  * @since 2.8.0
+ *
+ * @global bool $concatenate_scripts
+ *
+ * @return array
  */
 function print_admin_styles() {
-    global $wp_styles, $concatenate_scripts;
-
-    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
-        $wp_styles = new WP_Styles();
-    }
+    global $concatenate_scripts;
+
+    $wp_styles = wp_styles();
 
     script_concat_settings();
@@ -1006 +1022 @@
  *
  * @since 3.3.0
+ *
+ * @global WP_Styles $wp_styles
+ * @global bool      $concatenate_scripts
+ *
+ * @return array|void
  */
 function print_late_styles() {
@@ -1036 +1057 @@
  *
  * @ignore
+ *
+ * @global bool $compress_css
  */
 function _print_styles() {
-    global $wp_styles, $compress_css;
+    global $compress_css;
+
+    $wp_styles = wp_styles();
 
     $zip = $compress_css ? 1 : 0;
@@ -1065 +1090 @@
  *
  * @since 2.8.0
+ *
+ * @global bool $concatenate_scripts
+ * @global bool $compress_scripts
+ * @global bool $compress_css
  */
 function script_concat_settings() {