X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..341dfbb66f24f5145174c373267f889c31615cc5:/wp-includes/functions.wp-styles.php
diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php
index df4bd5ac..db8b583e 100644
--- a/wp-includes/functions.wp-styles.php
+++ b/wp-includes/functions.wp-styles.php
@@ -18,14 +18,20 @@
* @return bool True on success, false on failure.
*/
function wp_print_styles( $handles = false ) {
- do_action( 'wp_print_styles' );
if ( '' === $handles ) // for wp_head
$handles = false;
+ if ( ! $handles )
+ do_action( 'wp_print_styles' );
+
global $wp_styles;
- if ( !is_a($wp_styles, 'WP_Styles') ) {
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
+
if ( !$handles )
- return array(); // No need to instantiate if nothing's there.
+ return array(); // No need to instantiate if nothing is there.
else
$wp_styles = new WP_Styles();
}
@@ -33,6 +39,29 @@ function wp_print_styles( $handles = false ) {
return $wp_styles->do_items( $handles );
}
+/**
+ * Adds extra CSS.
+ *
+ * Works only if the stylesheet has already been added.
+ * Accepts a string $data containing the CSS. If two or more CSS code blocks are
+ * added to the same stylesheet $handle, they will be printed in the order
+ * they were added, i.e. the latter added styles can redeclare the previous.
+ *
+ * @since 3.3
+ * @see WP_Scripts::add_inline_style()
+ */
+function wp_add_inline_style( $handle, $data ) {
+ global $wp_styles;
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
+
+ return $wp_styles->add_inline_style( $handle, $data );
+}
+
/**
* Register CSS style file.
*
@@ -51,8 +80,12 @@ function wp_print_styles( $handles = false ) {
*/
function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
global $wp_styles;
- if ( !is_a($wp_styles, 'WP_Styles') )
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
$wp_styles = new WP_Styles();
+ }
$wp_styles->add( $handle, $src, $deps, $ver, $media );
}
@@ -68,8 +101,12 @@ function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media
*/
function wp_deregister_style( $handle ) {
global $wp_styles;
- if ( !is_a($wp_styles, 'WP_Styles') )
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
$wp_styles = new WP_Styles();
+ }
$wp_styles->remove( $handle );
}
@@ -95,8 +132,12 @@ function wp_deregister_style( $handle ) {
*/
function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
global $wp_styles;
- if ( !is_a($wp_styles, 'WP_Styles') )
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
$wp_styles = new WP_Styles();
+ }
if ( $src ) {
$_handle = explode('?', $handle);
@@ -105,6 +146,24 @@ function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false,
$wp_styles->enqueue( $handle );
}
+/**
+ * Remove an enqueued style.
+ *
+ * @since WP 3.1
+ * @see WP_Styles::dequeue() For parameter information.
+ */
+function wp_dequeue_style( $handle ) {
+ global $wp_styles;
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
+
+ $wp_styles->dequeue( $handle );
+}
+
/**
* Check whether style has been added to WordPress Styles.
*
@@ -119,8 +178,12 @@ function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false,
*/
function wp_style_is( $handle, $list = 'queue' ) {
global $wp_styles;
- if ( !is_a($wp_styles, 'WP_Styles') )
+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
$wp_styles = new WP_Styles();
+ }
$query = $wp_styles->query( $handle, $list );