Index: trunk/wp-includes/class.wp-scripts.php
===================================================================
--- trunk/wp-includes/class.wp-scripts.php (revision 42144)
+++ trunk/wp-includes/class.wp-scripts.php (working copy)
@@ -145,7 +145,7 @@
*
* @param WP_Scripts $this WP_Scripts instance (passed by reference).
*/
- do_action_ref_array( 'wp_default_scripts', array( &$this ) );
+ do_action_ref_array( 'wp_default_scripts', array(&$this) );
}
/**
@@ -196,15 +196,13 @@
* @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
*/
public function print_extra_script( $handle, $echo = true ) {
- if ( ! $output = $this->get_data( $handle, 'data' ) ) {
+ if ( !$output = $this->get_data( $handle, 'data' ) )
return;
- }
- if ( ! $echo ) {
+ if ( !$echo )
return $output;
- }
- echo "\n", $before_handle );
+ $before_handle = sprintf( "\n", $before_handle );
}
if ( $after_handle ) {
- $after_handle = sprintf( "\n", $after_handle );
+ $after_handle = sprintf( "\n", $after_handle );
}
if ( $this->do_concat ) {
@@ -289,8 +284,8 @@
_print_scripts();
$this->reset();
} elseif ( $this->in_default_dir( $srce ) && ! $conditional ) {
- $this->print_code .= $this->print_extra_script( $handle, false );
- $this->concat .= "$handle,";
+ $this->print_code .= $this->print_extra_script( $handle, false );
+ $this->concat .= "$handle,";
$this->concat_version .= "$handle$ver";
return true;
} else {
@@ -320,18 +315,16 @@
$src = $this->base_url . $src;
}
- if ( ! empty( $ver ) ) {
+ if ( ! empty( $ver ) )
$src = add_query_arg( 'ver', $ver, $src );
- }
/** This filter is documented in wp-includes/class.wp-scripts.php */
$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
- if ( ! $src ) {
+ if ( ! $src )
return true;
- }
- $tag = "{$cond_before}{$before_handle}\n{$after_handle}{$cond_after}";
+ $tag = "{$cond_before}{$before_handle}\n{$after_handle}{$cond_after}";
/**
* Filters the HTML script tag of an enqueued script.
@@ -401,7 +394,7 @@
$output = trim( implode( "\n", $output ), "\n" );
if ( $echo ) {
- printf( "\n", $output );
+ printf( "\n", $output );
}
return $output;
@@ -418,34 +411,30 @@
* @return bool
*/
public function localize( $handle, $object_name, $l10n ) {
- if ( $handle === 'jquery' ) {
+ if ( $handle === 'jquery' )
$handle = 'jquery-core';
- }
- if ( is_array( $l10n ) && isset( $l10n['l10n_print_after'] ) ) { // back compat, preserve the code in 'l10n_print_after' if present
+ if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
$after = $l10n['l10n_print_after'];
- unset( $l10n['l10n_print_after'] );
+ unset($l10n['l10n_print_after']);
}
foreach ( (array) $l10n as $key => $value ) {
- if ( ! is_scalar( $value ) ) {
+ if ( !is_scalar($value) )
continue;
- }
- $l10n[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+ $l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
}
$script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
- if ( ! empty( $after ) ) {
+ if ( !empty($after) )
$script .= "\n$after;";
- }
$data = $this->get_data( $handle, 'data' );
- if ( ! empty( $data ) ) {
+ if ( !empty( $data ) )
$script = "$data\n$script";
- }
return $this->add_data( $handle, 'data', $script );
}
@@ -463,15 +452,13 @@
* @return bool Not already in the group or a lower group
*/
public function set_group( $handle, $recursion, $group = false ) {
- if ( isset( $this->registered[ $handle ]->args ) && $this->registered[ $handle ]->args === 1 ) {
+ if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
$grp = 1;
- } else {
+ else
$grp = (int) $this->get_data( $handle, 'group' );
- }
- if ( false !== $group && $grp > $group ) {
+ if ( false !== $group && $grp > $group )
$grp = $group;
- }
return parent::set_group( $handle, $recursion, $grp );
}
@@ -478,7 +465,7 @@
/**
* Determines script dependencies.
- *
+ *
* @since 2.1.0
*
* @see WP_Dependencies::all_deps()
@@ -513,7 +500,7 @@
* @return array Handles of items that have been processed.
*/
public function do_head_items() {
- $this->do_items( false, 0 );
+ $this->do_items(false, 0);
return $this->done;
}
@@ -527,7 +514,7 @@
* @return array Handles of items that have been processed.
*/
public function do_footer_items() {
- $this->do_items( false, 1 );
+ $this->do_items(false, 1);
return $this->done;
}
@@ -562,12 +549,12 @@
* @since 2.8.0
*/
public function reset() {
- $this->do_concat = false;
- $this->print_code = '';
- $this->concat = '';
+ $this->do_concat = false;
+ $this->print_code = '';
+ $this->concat = '';
$this->concat_version = '';
- $this->print_html = '';
- $this->ext_version = '';
- $this->ext_handles = '';
+ $this->print_html = '';
+ $this->ext_version = '';
+ $this->ext_handles = '';
}
}
Index: trunk/wp-includes/class.wp-styles.php
===================================================================
--- trunk/wp-includes/class.wp-styles.php (revision 42144)
+++ trunk/wp-includes/class.wp-styles.php (working copy)
@@ -113,7 +113,7 @@
*
* @param WP_Styles $this WP_Styles instance (passed by reference).
*/
- do_action_ref_array( 'wp_default_styles', array( &$this ) );
+ do_action_ref_array( 'wp_default_styles', array(&$this) );
}
/**
@@ -127,24 +127,21 @@
* @return bool True on success, false on failure.
*/
public function do_item( $handle ) {
- if ( ! parent::do_item( $handle ) ) {
+ if ( !parent::do_item($handle) )
return false;
- }
- $obj = $this->registered[ $handle ];
- if ( null === $obj->ver ) {
+ $obj = $this->registered[$handle];
+ if ( null === $obj->ver )
$ver = '';
- } else {
+ else
$ver = $obj->ver ? $obj->ver : $this->default_version;
- }
- if ( isset( $this->args[ $handle ] ) ) {
- $ver = $ver ? $ver . '&' . $this->args[ $handle ] : $this->args[ $handle ];
- }
+ if ( isset($this->args[$handle]) )
+ $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
if ( $this->do_concat ) {
- if ( $this->in_default_dir( $obj->src ) && ! isset( $obj->extra['conditional'] ) && ! isset( $obj->extra['alt'] ) ) {
- $this->concat .= "$handle,";
+ if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+ $this->concat .= "$handle,";
$this->concat_version .= "$handle$ver";
$this->print_code .= $this->print_inline_style( $handle, false );
@@ -153,16 +150,15 @@
}
}
- if ( isset( $obj->args ) ) {
+ if ( isset($obj->args) )
$media = esc_attr( $obj->args );
- } else {
+ else
$media = 'all';
- }
// A single item may alias a set of items, by having dependencies, but no source.
if ( ! $obj->src ) {
if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
- $inline_style = sprintf( "\n", esc_attr( $handle ), $inline_style );
+ $inline_style = sprintf( "\n", esc_attr( $handle ), $inline_style );
if ( $this->do_concat ) {
$this->print_html .= $inline_style;
} else {
@@ -177,8 +173,8 @@
return true;
}
- $rel = isset( $obj->extra['alt'] ) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
- $title = isset( $obj->extra['title'] ) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+ $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
+ $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
/**
* Filters the HTML link tag of an enqueued style.
@@ -192,11 +188,11 @@
* @param string $href The stylesheet's source URL.
* @param string $media The stylesheet's media attribute.
*/
- $tag = apply_filters( 'style_loader_tag', "\n", $handle, $href, $media );
- if ( 'rtl' === $this->text_direction && isset( $obj->extra['rtl'] ) && $obj->extra['rtl'] ) {
+ $tag = apply_filters( 'style_loader_tag', "\n", $handle, $href, $media);
+ if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
- $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
- $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src, $ver, "$handle-rtl" ) );
+ $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+ $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
} else {
$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
}
@@ -221,7 +217,7 @@
$this->print_html .= $conditional_pre;
$this->print_html .= $tag;
if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
- $this->print_html .= sprintf( "\n", esc_attr( $handle ), $inline_style );
+ $this->print_html .= sprintf( "\n", esc_attr( $handle ), $inline_style );
}
$this->print_html .= $conditional_post;
} else {
@@ -281,7 +277,7 @@
return $output;
}
- printf( "\n", esc_attr( $handle ), $output );
+ printf( "\n", esc_attr( $handle ), $output );
return true;
}
@@ -324,13 +320,12 @@
* @return string Style's fully-qualified URL.
*/
public function _css_href( $src, $ver, $handle ) {
- if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
+ if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
$src = $this->base_url . $src;
}
- if ( ! empty( $ver ) ) {
- $src = add_query_arg( 'ver', $ver, $src );
- }
+ if ( !empty($ver) )
+ $src = add_query_arg('ver', $ver, $src);
/**
* Filters an enqueued style's fully-qualified URL.
@@ -353,14 +348,12 @@
* @return bool True if found, false if not.
*/
public function in_default_dir( $src ) {
- if ( ! $this->default_dirs ) {
+ if ( ! $this->default_dirs )
return true;
- }
foreach ( (array) $this->default_dirs as $test ) {
- if ( 0 === strpos( $src, $test ) ) {
+ if ( 0 === strpos($src, $test) )
return true;
- }
}
return false;
}
@@ -377,7 +370,7 @@
* @return array Handles of items that have been processed.
*/
public function do_footer_items() {
- $this->do_items( false, 1 );
+ $this->do_items(false, 1);
return $this->done;
}
@@ -387,9 +380,9 @@
* @since 3.3.0
*/
public function reset() {
- $this->do_concat = false;
- $this->concat = '';
+ $this->do_concat = false;
+ $this->concat = '';
$this->concat_version = '';
- $this->print_html = '';
+ $this->print_html = '';
}
}