Changeset 18480 for trunk/wp-includes/class.wp-styles.php

Timestamp:

07/28/2011 06:24:00 PM (12 years ago)

Author:

azaozz

Message:

Introduce WP_Dependencies::get_data() method, change scripts and styles priority to follow the "natural" order in HTML, i.e. the last one wins, props scribu, see #11520

File:

• trunk/wp-includes/class.wp-styles.php (modified) (3 diffs)

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

@@ -47 +47 @@
 
         if ( $this->do_concat ) {
-            if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+            if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
                 $this->concat .= "$handle,";
                 $this->concat_version .= "$handle$ver";
 
-                if ( !empty($this->registered[$handle]->extra['data']) )
-                    $this->print_code .= $this->registered[$handle]->extra['data'];
+                $this->print_code .= $this->get_data( $handle, 'after' );
 
                 return true;
@@ -98 +97 @@
     }
 
-    function add_inline_style( $handle, $data ) {
-        if ( !$data )
+    function add_inline_style( $handle, $code ) {
+        if ( !$code )
             return false;
 
-        if ( !empty( $this->registered[$handle]->extra['data'] ) )
-            $data .= "\n" . $this->registered[$handle]->extra['data'];
+        $after = $this->get_data( $handle, 'after' );
+        if ( !$after )
+            $after = array();
 
-        return $this->add_data( $handle, 'data', $data );
+        $after[] = $code;
+
+        return $this->add_data( $handle, 'after', $after );
     }
 
     function print_inline_style( $handle, $echo = true ) {
-        if ( empty($this->registered[$handle]->extra['data']) )
+        $output = $this->get_data( $handle, 'after' );
+
+        if ( empty( $output ) )
             return false;
 
-        $output = $this->registered[$handle]->extra['data'];
+        $output = implode( "\n", $output );
 
         if ( !$echo )
@@ -152 +156 @@
         return false;
     }
-    
+
     function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
         $this->do_items(false, 1);