ntwb / wordpress

src/wp-admin/term.php

Spacing +25 added lines, -25 removed lines

@@ -8,34 +8,34 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( empty( $_REQUEST['tag_ID'] ) ) {
-	$sendback = admin_url( 'edit-tags.php' );
-	if ( ! empty( $taxnow ) ) {
-		$sendback = add_query_arg( array( 'taxonomy' => $taxnow ), $sendback );
+if (empty($_REQUEST['tag_ID'])) {
+	$sendback = admin_url('edit-tags.php');
+	if ( ! empty($taxnow)) {
+		$sendback = add_query_arg(array('taxonomy' => $taxnow), $sendback);
 	}
-	wp_redirect( esc_url( $sendback ) );
+	wp_redirect(esc_url($sendback));
 	exit;
 }
 
-$tag_ID = absint( $_REQUEST['tag_ID'] );
-$tag    = get_term( $tag_ID, $taxnow, OBJECT, 'edit' );
+$tag_ID = absint($_REQUEST['tag_ID']);
+$tag    = get_term($tag_ID, $taxnow, OBJECT, 'edit');
 
-if ( ! $tag instanceof WP_Term ) {
-	wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+if ( ! $tag instanceof WP_Term) {
+	wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 }
 
-$tax      = get_taxonomy( $tag->taxonomy );
+$tax      = get_taxonomy($tag->taxonomy);
 $taxonomy = $tax->name;
 $title    = $tax->labels->edit_item;
 
-if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
-     ! current_user_can( $tax->cap->manage_terms )
+if ( ! in_array($taxonomy, get_taxonomies(array('show_ui' => true))) ||
+     ! current_user_can($tax->cap->manage_terms)
 ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to manage this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to manage this item.').'</p>',
 		403
 	);
 }
@@ -43,14 +43,14 @@ 
 $post_type = get_current_screen()->post_type;
 
 // Default to the first object_type associated with the taxonomy if no post type was passed.
-if ( empty( $post_type ) ) {
-	$post_type = reset( $tax->object_type );
+if (empty($post_type)) {
+	$post_type = reset($tax->object_type);
 }
 
-if ( 'post' != $post_type ) {
-	$parent_file  = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+if ('post' != $post_type) {
+	$parent_file  = ('attachment' == $post_type) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
-} elseif ( 'link_category' == $taxonomy ) {
+} elseif ('link_category' == $taxonomy) {
 	$parent_file  = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
@@ -58,11 +58,11 @@ 
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_pagination' => $tax->labels->items_list_navigation,
 	'heading_list'       => $tax->labels->items_list,
-) );
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
-include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/edit-tag-form.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/index.php

Spacing +64 added lines, -64 removed lines

@@ -7,116 +7,116 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once(ABSPATH.'wp-admin/includes/dashboard.php');
 
 wp_dashboard_setup();
 
-wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
-	wp_enqueue_script( 'customize-loader' );
-if ( current_user_can( 'install_plugins' ) ) {
-	wp_enqueue_script( 'plugin-install' );
-	wp_enqueue_script( 'updates' );
+wp_enqueue_script('dashboard');
+if (current_user_can('edit_theme_options'))
+	wp_enqueue_script('customize-loader');
+if (current_user_can('install_plugins')) {
+	wp_enqueue_script('plugin-install');
+	wp_enqueue_script('updates');
 }
-if ( current_user_can( 'upload_files' ) )
-	wp_enqueue_script( 'media-upload' );
+if (current_user_can('upload_files'))
+	wp_enqueue_script('media-upload');
 add_thickbox();
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
 
-$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.' ) . '</p>';
+$help = '<p>'.__('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.').'</p>';
 
 // Not using chaining here, so as to be parseable by PHP4.
 $screen = get_current_screen();
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
 // Help tabs
 
-$help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';
-$help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';
+$help  = '<p>'.__('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.').'</p>';
+$help .= '<p>'.__('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-navigation',
-	'title'   => __( 'Navigation' ),
+	'title'   => __('Navigation'),
 	'content' => $help,
-) );
+));
 
-$help  = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';
+$help  = '<p>'.__('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.').'</p>';
+$help .= '<p>'.__('<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.').'</p>';
+$help .= '<p>'.__('<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.').'</p>';
+$help .= '<p>'.__('<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-layout',
-	'title'   => __( 'Layout' ),
+	'title'   => __('Layout'),
 	'content' => $help,
-) );
-
-$help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
-	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
-	$help .= '<p>' . sprintf(
+));
+
+$help = '<p>'.__('The boxes on your Dashboard screen are:').'</p>';
+if (current_user_can('edit_posts'))
+	$help .= '<p>'.__('<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.').'</p>';
+	$help .= '<p>'.__('<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.').'</p>';
+if (is_blog_admin() && current_user_can('edit_posts'))
+	$help .= '<p>'.__("<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started.").'</p>';
+if ( ! is_multisite() && current_user_can('install_plugins'))
+	$help .= '<p>'.sprintf(
 		/* translators: %s: WordPress Planet URL */
-		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
-		__( 'https://planet.wordpress.org/' )
-	) . '</p>';
+		__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.'),
+		__('https://planet.wordpress.org/')
+	).'</p>';
 else
-	$help .= '<p>' . sprintf(
+	$help .= '<p>'.sprintf(
 		/* translators: %s: WordPress Planet URL */
-		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
-		__( 'https://planet.wordpress.org/' )
-	) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
-	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+		__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.'),
+		__('https://planet.wordpress.org/')
+	).'</p>';
+if (current_user_can('edit_theme_options'))
+	$help .= '<p>'.__('<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-content',
-	'title'   => __( 'Content' ),
+	'title'   => __('Content'),
 	'content' => $help,
-) );
+));
 
-unset( $help );
+unset($help);
 
 $screen->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+<?php if (has_action('welcome_panel') && current_user_can('edit_theme_options')) :
 	$classes = 'welcome-panel';
 
-	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+	$option = get_user_meta(get_current_user_id(), 'show_welcome_panel', true);
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
-	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
+	$hide = 0 == $option || (2 == $option && wp_get_current_user()->user_email != get_option('admin_email'));
+	if ($hide)
 		$classes .= ' hidden'; ?>
 
-	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
-		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
-		<a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>" aria-label="<?php esc_attr_e( 'Dismiss the welcome panel' ); ?>"><?php _e( 'Dismiss' ); ?></a>
+	<div id="welcome-panel" class="<?php echo esc_attr($classes); ?>">
+		<?php wp_nonce_field('welcome-panel-nonce', 'welcomepanelnonce', false); ?>
+		<a class="welcome-panel-close" href="<?php echo esc_url(admin_url('?welcome=0')); ?>" aria-label="<?php esc_attr_e('Dismiss the welcome panel'); ?>"><?php _e('Dismiss'); ?></a>
 		<?php
 		/**
 		 * Add content to the welcome panel on the admin dashboard.
@@ -127,7 +127,7 @@ 
 		 *
 		 * @since 3.5.0
 		 */
-		do_action( 'welcome_panel' );
+		do_action('welcome_panel');
 		?>
 	</div>
 <?php endif; ?>
@@ -139,4 +139,4 @@ 
 </div><!-- wrap -->
 
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +19 added lines, -10 removed lines

@@ -15,18 +15,21 @@ 
 wp_dashboard_setup();
 
 wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
+if ( current_user_can( 'edit_theme_options' ) ) {
 	wp_enqueue_script( 'customize-loader' );
+}
 if ( current_user_can( 'install_plugins' ) ) {
 	wp_enqueue_script( 'plugin-install' );
 	wp_enqueue_script( 'updates' );
 }
-if ( current_user_can( 'upload_files' ) )
+if ( current_user_can( 'upload_files' ) ) {
 	wp_enqueue_script( 'media-upload' );
+}
 add_thickbox();
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
@@ -65,25 +68,29 @@ 
 ) );
 
 $help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
+if ( current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
+}
 	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
+}
+if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-else
+} else {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
+}
+if ( current_user_can( 'edit_theme_options' ) ) {
 	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+}
 
 $screen->add_help_tab( array(
 	'id'      => 'help-content',
@@ -111,8 +118,10 @@ 
 	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
 	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
-		$classes .= ' hidden'; ?>
+	if ( $hide ) {
+			$classes .= ' hidden';
+	}
+	?>
 
 	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
 		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>

src/wp-admin/about.php

Spacing +74 added lines, -74 removed lines

@@ -7,15 +7,15 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! wp_is_mobile() ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-mediaelement' );
-	wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-		'pluginPath'        => includes_url( 'js/mediaelement/', 'relative' ),
+if ( ! wp_is_mobile()) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-mediaelement');
+	wp_localize_script('mediaelement', '_wpmejsSettings', array(
+		'pluginPath'        => includes_url('js/mediaelement/', 'relative'),
 		'pauseOtherPlayers' => '',
-	) );
+	));
 }
 
 /**
@@ -29,33 +29,33 @@ 
  * @param $output Video shortcode HTML output.
  * @return string Filtered HTML content to display video.
  */
-function _wp_override_admin_video_width_limit( $output ) {
-	return str_replace( array( '640', '384' ), array( '1050', '630' ), $output );
+function _wp_override_admin_video_width_limit($output) {
+	return str_replace(array('640', '384'), array('1050', '630'), $output);
 }
 
 $video_url = 'https://videopress.com/embed/scFdjVo6?hd=true';
-$locale    = str_replace( '_', '-', get_locale() );
-list( $locale ) = explode( '-', $locale );
-if ( 'en' !== $locale ) {
-	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+$locale    = str_replace('_', '-', get_locale());
+list($locale) = explode('-', $locale);
+if ('en' !== $locale) {
+	$video_url = add_query_arg('defaultLangCode', $locale, $video_url);
 }
 
-$title = __( 'About' );
+$title = __('About');
 
-list( $display_version ) = explode( '-', $wp_version );
+list($display_version) = explode('-', $wp_version);
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 	<div class="wrap about-wrap">
-		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
+		<h1><?php printf(__('Welcome to WordPress&nbsp;%s'), $display_version); ?></h1>
 
-		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version. WordPress %s changes a lot behind the scenes to make your WordPress experience even better!' ), $display_version ); ?></p>
-		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+		<p class="about-text"><?php printf(__('Thank you for updating to the latest version. WordPress %s changes a lot behind the scenes to make your WordPress experience even better!'), $display_version); ?></p>
+		<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
-			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e('What&#8217;s New'); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 		</h2>
 
 		<div class="headline-feature feature-video" style="background-color:#191E23;">
@@ -68,12 +68,12 @@ 
 		<hr>
 
 		<div class="streamlined-updates feature-section one-col">
-			<h2><?php _e( 'Streamlined Updates' ); ?></h2>
-			<p><?php _e( 'Don&#8217;t lose your place: stay on the same page while you update, install, and delete your plugins and themes.' ); ?></p>
+			<h2><?php _e('Streamlined Updates'); ?></h2>
+			<p><?php _e('Don&#8217;t lose your place: stay on the same page while you update, install, and delete your plugins and themes.'); ?></p>
 			<?php
-			if ( ! wp_is_mobile() ) {
-				add_filter( 'wp_video_shortcode', '_wp_override_admin_video_width_limit' );
-				echo wp_video_shortcode( array(
+			if ( ! wp_is_mobile()) {
+				add_filter('wp_video_shortcode', '_wp_override_admin_video_width_limit');
+				echo wp_video_shortcode(array(
 					'mp4'      => 'https://cldup.com/5ho0rKdXXe.mp4',
 					'webm'     => 'https://cldup.com/VdSgwAtHNX.webm',
 					'poster'   => 'https://cldup.com/c0kfjoVcFo.png',
@@ -82,8 +82,8 @@ 
 					'width'    => 1050,
 					'height'   => 630,
 					'class'    => 'wp-video-shortcode feature-video',
-				) );
-				remove_filter( 'wp_video_shortcode', '_wp_override_admin_video_width_limit' );
+				));
+				remove_filter('wp_video_shortcode', '_wp_override_admin_video_width_limit');
 			} else {
 				echo '<img src="https://cldup.com/c0kfjoVcFo.png" alt="" srcset=""/>';
 			}
@@ -93,62 +93,62 @@ 
 		<hr />
 
 		<div class="native-fonts feature-section one-col">
-			<h2><?php _e( 'Native Fonts' ); ?></h2>
-			<p><?php _e( 'The WordPress dashboard now takes advantage of the fonts you already have, making it load faster and letting you feel more at home on whatever device you use.' ); ?></p>
+			<h2><?php _e('Native Fonts'); ?></h2>
+			<p><?php _e('The WordPress dashboard now takes advantage of the fonts you already have, making it load faster and letting you feel more at home on whatever device you use.'); ?></p>
 			<img src="https://cldup.com/bCuNzRdtHm.png" alt="" srcset="https://cldup.com/YiMPjePe7J.png 200w, https://cldup.com/xqWD9T2h61.png 371w, https://cldup.com/OGC8NS0zmX.png 510w, https://cldup.com/cXPTP-tbix.png 560w, https://cldup.com/gjZNfc58Ya.png 781w, https://cldup.com/Hqmo5VLb-E.png 922w, https://cldup.com/5tU3wu6537.png 2000w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 959px) calc(100vw - 116px), (max-width: 1290px) calc(100vw - 240px), 1050px"/>
 		</div>
 
 		<hr />
 
 		<div class="feature-section two-col">
-			<h2><?php _e( 'Editor Improvements' ); ?></h2>
+			<h2><?php _e('Editor Improvements'); ?></h2>
 			<div class="col">
 				<img src="https://cldup.com/rUgTVXZedO.png" alt="" srcset="https://cldup.com/P9uN0OArJ7.png 200w, https://cldup.com/3TU9rBnLw5.png 384w, https://cldup.com/k3kZhYI0tE.png 608w, https://cldup.com/ACglmMoOdP.png 789w, https://cldup.com/rUgTVXZedO.png 992w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
-				<h3><?php _e( 'Inline Link Checker' ); ?></h3>
+				<h3><?php _e('Inline Link Checker'); ?></h3>
 				<p><?php
 					printf(
 						/* translators: %s: Home URL appended with 'wordpress.org'  */
-						__( 'Ever accidentally made a link to %s? Now WordPress automatically checks to make sure you didn&#8217;t.' ),
-						home_url( 'wordpress.org' )
+						__('Ever accidentally made a link to %s? Now WordPress automatically checks to make sure you didn&#8217;t.'),
+						home_url('wordpress.org')
 					);
 				?></p>
 			</div>
 			<div class="col">
 				<img src="https://cldup.com/fxzqZFrDxo.png" alt="" srcset="https://cldup.com/QAjwr6h33d.png 200w, https://cldup.com/YwJSETYBwk.png 400w, https://cldup.com/wbwkFYER9C.png 561w, https://cldup.com/9T-ckRM67P.png 701w, https://cldup.com/sQYWMMsU4g.png 992w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
-				<h3><?php _e( 'Content Recovery' ); ?></h3>
-				<p><?php _e( 'As you type, WordPress saves your content to the browser. Recovering saved content is even easier with WordPress 4.6.' ); ?></p>
+				<h3><?php _e('Content Recovery'); ?></h3>
+				<p><?php _e('As you type, WordPress saves your content to the browser. Recovering saved content is even easier with WordPress 4.6.'); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
 		<div class="changelog">
-			<h2><?php _e( 'Under the Hood' ); ?></h2>
+			<h2><?php _e('Under the Hood'); ?></h2>
 
 			<div class="under-the-hood three-col">
 				<div class="col">
-					<h3><?php _e( 'Resource Hints' ); ?></h3>
+					<h3><?php _e('Resource Hints'); ?></h3>
 					<p><?php
 						printf(
 							/* translators: %s: https://make.wordpress.org/core/2016/07/06/resource-hints-in-4-6/ */
-							__( '<a href="%s">Resource hints help browsers</a> decide which resources to fetch and preprocess. WordPress 4.6 adds them automatically for your styles and scripts making your site even faster.' ),
+							__('<a href="%s">Resource hints help browsers</a> decide which resources to fetch and preprocess. WordPress 4.6 adds them automatically for your styles and scripts making your site even faster.'),
 							'https://make.wordpress.org/core/2016/07/06/resource-hints-in-4-6/'
 						);
 					?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'Robust Requests' ); ?></h3>
-					<p><?php _e( 'The HTTP API now leverages the Requests library, improving HTTP standard support and adding case-insensitive headers, parallel HTTP requests, and support for Internationalized Domain Names.' ); ?></p>
+					<h3><?php _e('Robust Requests'); ?></h3>
+					<p><?php _e('The HTTP API now leverages the Requests library, improving HTTP standard support and adding case-insensitive headers, parallel HTTP requests, and support for Internationalized Domain Names.'); ?></p>
 				</div>
 				<div class="col">
 					<h3><?php
 						/* translators: 1: WP_Term_Query, 2: WP_Post_Type */
-						printf( __( '%1$s and %2$s' ), '<code>WP_Term_Query</code>', '<code>WP_Post_Type</code>' );
+						printf(__('%1$s and %2$s'), '<code>WP_Term_Query</code>', '<code>WP_Post_Type</code>');
 					?></h3>
 					<p><?php
 						printf(
 							/* translators: 1: WP_Term_Query, 2: WP_Post_Type */
-							__( 'A new %1$s class adds flexibility to query term information while a new %2$s object makes interacting with post types more predictable.' ),
+							__('A new %1$s class adds flexibility to query term information while a new %2$s object makes interacting with post types more predictable.'),
 							'<code>WP_Term_Query</code>',
 							'<code>WP_Post_Type</code>'
 						);
@@ -158,36 +158,36 @@ 
 
 			<div class="under-the-hood three-col">
 				<div class="col">
-					<h3><?php _e( 'Meta Registration API' ); ?></h3>
+					<h3><?php _e('Meta Registration API'); ?></h3>
 					<p><?php
 						printf(
 							/* translators: %s: https://make.wordpress.org/core/2016/07/08/enhancing-register_meta-in-4-6/  */
-							__( 'The Meta Registration API <a href="%s">has been expanded</a> to support types, descriptions, and REST API visibility.' ),
+							__('The Meta Registration API <a href="%s">has been expanded</a> to support types, descriptions, and REST API visibility.'),
 							'https://make.wordpress.org/core/2016/07/08/enhancing-register_meta-in-4-6/'
 						);
 					?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'Translations On Demand' ); ?></h3>
-					<p><?php _e( 'WordPress will install and use the newest language packs for your plugins and themes as soon as they&#8217;re available from <a href="https://translate.wordpress.org/">WordPress.org&#8217;s community of translators</a>.' ); ?></p>
+					<h3><?php _e('Translations On Demand'); ?></h3>
+					<p><?php _e('WordPress will install and use the newest language packs for your plugins and themes as soon as they&#8217;re available from <a href="https://translate.wordpress.org/">WordPress.org&#8217;s community of translators</a>.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'JavaScript Library Updates' ); ?></h3>
-					<p><?php _e( 'Masonry 3.3.2, imagesLoaded 3.2.0, MediaElement.js 2.22.0, TinyMCE 4.4.1, and Backbone.js 1.3.3 are bundled.' ); ?></p>
+					<h3><?php _e('JavaScript Library Updates'); ?></h3>
+					<p><?php _e('Masonry 3.3.2, imagesLoaded 3.2.0, MediaElement.js 2.22.0, TinyMCE 4.4.1, and Backbone.js 1.3.3 are bundled.'); ?></p>
 				</div>
 			</div>
 
 			<div class="under-the-hood two-col">
 				<div class="col">
-					<h3><?php _e( 'Customizer APIs for Setting Validation and Notifications' ); ?></h3>
-					<p><?php _e( 'Settings now have an <a href="https://make.wordpress.org/core/2016/07/05/customizer-apis-in-4-6-for-setting-validation-and-notifications/">API for enforcing validation constraints</a>. Likewise, customizer controls now support notifications, which are used to display validation errors instead of failing silently.' ); ?></p>
+					<h3><?php _e('Customizer APIs for Setting Validation and Notifications'); ?></h3>
+					<p><?php _e('Settings now have an <a href="https://make.wordpress.org/core/2016/07/05/customizer-apis-in-4-6-for-setting-validation-and-notifications/">API for enforcing validation constraints</a>. Likewise, customizer controls now support notifications, which are used to display validation errors instead of failing silently.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'Multisite, now faster than ever' ); ?></h3>
+					<h3><?php _e('Multisite, now faster than ever'); ?></h3>
 					<p><?php
 						printf(
 							/* translators: 1: WP_Site_Query, 2: WP_Network_Query */
-							__( 'Cached and comprehensive site queries improve your network admin experience. The addition of %1$s and %2$s help craft advanced queries with less effort.' ),
+							__('Cached and comprehensive site queries improve your network admin experience. The addition of %1$s and %2$s help craft advanced queries with less effort.'),
 							'<code>WP_Site_Query</code>',
 							'<code>WP_Network_Query</code>'
 						);
@@ -199,47 +199,47 @@ 
 		<hr />
 
 		<div class="return-to-dashboard">
-			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-				<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-					<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+			<?php if (current_user_can('update_core') && isset($_GET['updated'])) : ?>
+				<a href="<?php echo esc_url(self_admin_url('update-core.php')); ?>">
+					<?php is_multisite() ? _e('Return to Updates') : _e('Return to Dashboard &rarr; Updates'); ?>
 				</a> |
 			<?php endif; ?>
-			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+			<a href="<?php echo esc_url(self_admin_url()); ?>"><?php is_blog_admin() ? _e('Go to Dashboard &rarr; Home') : _e('Go to Dashboard'); ?></a>
 		</div>
 
 	</div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;
 
-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+__('Maintenance Release');
+__('Maintenance Releases');
 
-__( 'Security Release' );
-__( 'Security Releases' );
+__('Security Release');
+__('Security Releases');
 
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
+__('Maintenance and Security Release');
+__('Maintenance and Security Releases');
 
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
+__('<strong>Version %s</strong> addressed one security issue.');
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+__('<strong>Version %s</strong> addressed some security issues.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.');
 
 /* translators: %s: Codex URL */
-__( 'For more information, see <a href="%s">the release notes</a>.' );
+__('For more information, see <a href="%s">the release notes</a>.');

src/wp-content/themes/twentythirteen/functions.php

Spacing +137 added lines, -137 removed lines

@@ -28,19 +28,19 @@ 
  *
  * @see twentythirteen_content_width() for template-specific adjustments.
  */
-if ( ! isset( $content_width ) )
+if ( ! isset($content_width))
 	$content_width = 604;
 
 /**
  * Add support for a custom header image.
  */
-require get_template_directory() . '/inc/custom-header.php';
+require get_template_directory().'/inc/custom-header.php';
 
 /**
  * Twenty Thirteen only works in WordPress 3.6 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
-	require get_template_directory() . '/inc/back-compat.php';
+if (version_compare($GLOBALS['wp_version'], '3.6-alpha', '<'))
+	require get_template_directory().'/inc/back-compat.php';
 
 /**
  * Twenty Thirteen setup.
@@ -66,50 +66,50 @@ 
 	 * replace to change 'twentythirteen' to the name of your theme in all
 	 * template files.
 	 */
-	load_theme_textdomain( 'twentythirteen' );
+	load_theme_textdomain('twentythirteen');
 
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
 	 * specifically font, colors, icons, and column width.
 	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentythirteen_fonts_url() ) );
+	add_editor_style(array('css/editor-style.css', 'genericons/genericons.css', twentythirteen_fonts_url()));
 
 	// Adds RSS feed links to <head> for posts and comments.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	/*
 	 * Switches default core markup for search form, comment form,
 	 * and comments to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
+	add_theme_support('html5', array(
 		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	));
 
 	/*
 	 * This theme supports all available post formats by default.
 	 * See https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
+	add_theme_support('post-formats', array(
 		'aside', 'audio', 'chat', 'gallery', 'image', 'link', 'quote', 'status', 'video'
-	) );
+	));
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Navigation Menu', 'twentythirteen' ) );
+	register_nav_menu('primary', __('Navigation Menu', 'twentythirteen'));
 
 	/*
 	 * This theme uses a custom image size for featured images, displayed on
 	 * "standard" posts and pages.
 	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 604, 270, true );
+	add_theme_support('post-thumbnails');
+	set_post_thumbnail_size(604, 270, true);
 
 	// This theme uses its own gallery styles.
-	add_filter( 'use_default_gallery_style', '__return_false' );
+	add_filter('use_default_gallery_style', '__return_false');
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
+	add_theme_support('customize-selective-refresh-widgets');
 }
-add_action( 'after_setup_theme', 'twentythirteen_setup' );
+add_action('after_setup_theme', 'twentythirteen_setup');
 
 /**
  * Return the Google font stylesheet URL, if available.
@@ -128,28 +128,28 @@ 
 	 * supported by Source Sans Pro, translate this to 'off'. Do not translate
 	 * into your own language.
 	 */
-	$source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
+	$source_sans_pro = _x('on', 'Source Sans Pro font: on or off', 'twentythirteen');
 
 	/* Translators: If there are characters in your language that are not
 	 * supported by Bitter, translate this to 'off'. Do not translate into your
 	 * own language.
 	 */
-	$bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
+	$bitter = _x('on', 'Bitter font: on or off', 'twentythirteen');
 
-	if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
+	if ('off' !== $source_sans_pro || 'off' !== $bitter) {
 		$font_families = array();
 
-		if ( 'off' !== $source_sans_pro )
+		if ('off' !== $source_sans_pro)
 			$font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
 
-		if ( 'off' !== $bitter )
+		if ('off' !== $bitter)
 			$font_families[] = 'Bitter:400,700';
 
 		$query_args = array(
-			'family' => urlencode( implode( '|', $font_families ) ),
-			'subset' => urlencode( 'latin,latin-ext' ),
+			'family' => urlencode(implode('|', $font_families)),
+			'subset' => urlencode('latin,latin-ext'),
 		);
-		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$fonts_url = add_query_arg($query_args, 'https://fonts.googleapis.com/css');
 	}
 
 	return $fonts_url;
@@ -165,30 +165,30 @@ 
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments'))
+		wp_enqueue_script('comment-reply');
 
 	// Adds Masonry to handle vertical alignment of footer widgets.
-	if ( is_active_sidebar( 'sidebar-1' ) )
-		wp_enqueue_script( 'jquery-masonry' );
+	if (is_active_sidebar('sidebar-1'))
+		wp_enqueue_script('jquery-masonry');
 
 	// Loads JavaScript file with functionality specific to Twenty Thirteen.
-	wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160717', true );
+	wp_enqueue_script('twentythirteen-script', get_template_directory_uri().'/js/functions.js', array('jquery'), '20160717', true);
 
 	// Add Source Sans Pro and Bitter fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
+	wp_enqueue_style('twentythirteen-fonts', twentythirteen_fonts_url(), array(), null);
 
 	// Add Genericons font, used in the main stylesheet.
-	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.03' );
+	wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.03');
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), '2013-07-18' );
+	wp_enqueue_style('twentythirteen-style', get_stylesheet_uri(), array(), '2013-07-18');
 
 	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '2013-07-18' );
-	wp_style_add_data( 'twentythirteen-ie', 'conditional', 'lt IE 9' );
+	wp_enqueue_style('twentythirteen-ie', get_template_directory_uri().'/css/ie.css', array('twentythirteen-style'), '2013-07-18');
+	wp_style_add_data('twentythirteen-ie', 'conditional', 'lt IE 9');
 }
-add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' );
+add_action('wp_enqueue_scripts', 'twentythirteen_scripts_styles');
 
 /**
  * Filter the page title.
@@ -202,27 +202,27 @@ 
  * @param string $sep   Optional separator.
  * @return string The filtered title.
  */
-function twentythirteen_wp_title( $title, $sep ) {
+function twentythirteen_wp_title($title, $sep) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if (is_feed())
 		return $title;
 
 	// Add the site name.
-	$title .= get_bloginfo( 'name', 'display' );
+	$title .= get_bloginfo('name', 'display');
 
 	// Add the site description for the home/front page.
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	$site_description = get_bloginfo('description', 'display');
+	if ($site_description && (is_home() || is_front_page()))
 		$title = "$title $sep $site_description";
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentythirteen' ), max( $paged, $page ) );
+	if (($paged >= 2 || $page >= 2) && ! is_404())
+		$title = "$title $sep ".sprintf(__('Page %s', 'twentythirteen'), max($paged, $page));
 
 	return $title;
 }
-add_filter( 'wp_title', 'twentythirteen_wp_title', 10, 2 );
+add_filter('wp_title', 'twentythirteen_wp_title', 10, 2);
 
 /**
  * Register two widget areas.
@@ -230,29 +230,29 @@ 
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Main Widget Area', 'twentythirteen' ),
+	register_sidebar(array(
+		'name'          => __('Main Widget Area', 'twentythirteen'),
 		'id'            => 'sidebar-1',
-		'description'   => __( 'Appears in the footer section of the site.', 'twentythirteen' ),
+		'description'   => __('Appears in the footer section of the site.', 'twentythirteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h3 class="widget-title">',
 		'after_title'   => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name'          => __( 'Secondary Widget Area', 'twentythirteen' ),
+	register_sidebar(array(
+		'name'          => __('Secondary Widget Area', 'twentythirteen'),
 		'id'            => 'sidebar-2',
-		'description'   => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ),
+		'description'   => __('Appears on posts and pages in the sidebar.', 'twentythirteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h3 class="widget-title">',
 		'after_title'   => '</h3>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentythirteen_widgets_init' );
+add_action('widgets_init', 'twentythirteen_widgets_init');
 
-if ( ! function_exists( 'twentythirteen_paging_nav' ) ) :
+if ( ! function_exists('twentythirteen_paging_nav')) :
 /**
  * Display navigation to next/previous set of posts when applicable.
  *
@@ -262,19 +262,19 @@ 
 	global $wp_query;
 
 	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 )
+	if ($wp_query->max_num_pages < 2)
 		return;
 	?>
 	<nav class="navigation paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e('Posts navigation', 'twentythirteen'); ?></h1>
 		<div class="nav-links">
 
-			<?php if ( get_next_posts_link() ) : ?>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen' ) ); ?></div>
+			<?php if (get_next_posts_link()) : ?>
+			<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentythirteen')); ?></div>
 			<?php endif; ?>
 
-			<?php if ( get_previous_posts_link() ) : ?>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></div>
+			<?php if (get_previous_posts_link()) : ?>
+			<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentythirteen')); ?></div>
 			<?php endif; ?>
 
 		</div><!-- .nav-links -->
@@ -283,7 +283,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentythirteen_post_nav' ) ) :
+if ( ! function_exists('twentythirteen_post_nav')) :
 /**
  * Display navigation to next/previous post when applicable.
  *
@@ -293,18 +293,18 @@ 
 	global $post;
 
 	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	$previous = (is_attachment()) ? get_post($post->post_parent) : get_adjacent_post(false, '', true);
+	$next     = get_adjacent_post(false, '', false);
 
-	if ( ! $next && ! $previous )
+	if ( ! $next && ! $previous)
 		return;
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e('Post navigation', 'twentythirteen'); ?></h1>
 		<div class="nav-links">
 
-			<?php previous_post_link( '%link', _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'twentythirteen' ) ); ?>
-			<?php next_post_link( '%link', _x( '%title <span class="meta-nav">&rarr;</span>', 'Next post link', 'twentythirteen' ) ); ?>
+			<?php previous_post_link('%link', _x('<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'twentythirteen')); ?>
+			<?php next_post_link('%link', _x('%title <span class="meta-nav">&rarr;</span>', 'Next post link', 'twentythirteen')); ?>
 
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
@@ -312,7 +312,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
+if ( ! function_exists('twentythirteen_entry_meta')) :
 /**
  * Print HTML with meta information for current post: categories, tags, permalink, author, and date.
  *
@@ -321,36 +321,36 @@ 
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() )
-		echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
+	if (is_sticky() && is_home() && ! is_paged())
+		echo '<span class="featured-post">'.esc_html__('Sticky', 'twentythirteen').'</span>';
 
-	if ( ! has_post_format( 'link' ) && 'post' == get_post_type() )
+	if ( ! has_post_format('link') && 'post' == get_post_type())
 		twentythirteen_entry_date();
 
 	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) );
-	if ( $categories_list ) {
-		echo '<span class="categories-links">' . $categories_list . '</span>';
+	$categories_list = get_the_category_list(__(', ', 'twentythirteen'));
+	if ($categories_list) {
+		echo '<span class="categories-links">'.$categories_list.'</span>';
 	}
 
 	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
-	if ( $tag_list ) {
-		echo '<span class="tags-links">' . $tag_list . '</span>';
+	$tag_list = get_the_tag_list('', __(', ', 'twentythirteen'));
+	if ($tag_list) {
+		echo '<span class="tags-links">'.$tag_list.'</span>';
 	}
 
 	// Post author
-	if ( 'post' == get_post_type() ) {
-		printf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ),
+	if ('post' == get_post_type()) {
+		printf('<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+			esc_url(get_author_posts_url(get_the_author_meta('ID'))),
+			esc_attr(sprintf(__('View all posts by %s', 'twentythirteen'), get_the_author())),
 			get_the_author()
 		);
 	}
 }
 endif;
 
-if ( ! function_exists( 'twentythirteen_entry_date' ) ) :
+if ( ! function_exists('twentythirteen_entry_date')) :
 /**
  * Print HTML with date information for current post.
  *
@@ -361,27 +361,27 @@ 
  * @param boolean $echo (optional) Whether to echo the date. Default true.
  * @return string The HTML-formatted post date.
  */
-function twentythirteen_entry_date( $echo = true ) {
-	if ( has_post_format( array( 'chat', 'status' ) ) )
-		$format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' );
+function twentythirteen_entry_date($echo = true) {
+	if (has_post_format(array('chat', 'status')))
+		$format_prefix = _x('%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen');
 	else
 		$format_prefix = '%2$s';
 
-	$date = sprintf( '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
-		esc_url( get_permalink() ),
-		esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) )
+	$date = sprintf('<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
+		esc_url(get_permalink()),
+		esc_attr(sprintf(__('Permalink to %s', 'twentythirteen'), the_title_attribute('echo=0'))),
+		esc_attr(get_the_date('c')),
+		esc_html(sprintf($format_prefix, get_post_format_string(get_post_format()), get_the_date()))
 	);
 
-	if ( $echo )
+	if ($echo)
 		echo $date;
 
 	return $date;
 }
 endif;
 
-if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) :
+if ( ! function_exists('twentythirteen_the_attached_image')) :
 /**
  * Print the attached image with a link to the next attached image.
  *
@@ -398,7 +398,7 @@ 
 	 *     @type int The attachment width in pixels.
 	 * }
 	 */
-	$attachment_size     = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
+	$attachment_size     = apply_filters('twentythirteen_attachment_size', array(724, 724));
 	$next_attachment_url = wp_get_attachment_url();
 	$post                = get_post();
 
@@ -408,7 +408,7 @@ 
 	 * looking at the last image in a gallery), or, in a gallery of one, just the
 	 * link to that image file.
 	 */
-	$attachment_ids = get_posts( array(
+	$attachment_ids = get_posts(array(
 		'post_parent'    => $post->post_parent,
 		'fields'         => 'ids',
 		'numberposts'    => -1,
@@ -417,30 +417,30 @@ 
 		'post_mime_type' => 'image',
 		'order'          => 'ASC',
 		'orderby'        => 'menu_order ID',
-	) );
+	));
 
 	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+	if (count($attachment_ids) > 1) {
+		foreach ($attachment_ids as $idx => $attachment_id) {
+			if ($attachment_id == $post->ID) {
+				$next_id = $attachment_ids[($idx + 1) % count($attachment_ids)];
 				break;
 			}
 		}
 
 		// get the URL of the next image attachment...
-		if ( $next_id )
-			$next_attachment_url = get_attachment_link( $next_id );
+		if ($next_id)
+			$next_attachment_url = get_attachment_link($next_id);
 
 		// or get the URL of the first image attachment.
 		else
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
+			$next_attachment_url = get_attachment_link(reset($attachment_ids));
 	}
 
-	printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
-		esc_url( $next_attachment_url ),
-		the_title_attribute( array( 'echo' => false ) ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
+	printf('<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
+		esc_url($next_attachment_url),
+		the_title_attribute(array('echo' => false)),
+		wp_get_attachment_image($post->ID, $attachment_size)
 	);
 }
 endif;
@@ -459,12 +459,12 @@ 
  */
 function twentythirteen_get_link_url() {
 	$content = get_the_content();
-	$has_url = get_url_in_content( $content );
+	$has_url = get_url_in_content($content);
 
-	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	return ($has_url) ? $has_url : apply_filters('the_permalink', get_permalink());
 }
 
-if ( ! function_exists( 'twentythirteen_excerpt_more' ) && ! is_admin() ) :
+if ( ! function_exists('twentythirteen_excerpt_more') && ! is_admin()) :
 /**
  * Replaces "[...]" (appended to automatically generated excerpts) with ...
  * and a Continue reading link.
@@ -474,15 +474,15 @@ 
  * @param string $more Default Read More excerpt link.
  * @return string Filtered Read More excerpt link.
  */
-function twentythirteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+function twentythirteen_excerpt_more($more) {
+	$link = sprintf('<a href="%1$s" class="more-link">%2$s</a>',
+		esc_url(get_permalink(get_the_ID())),
 			/* translators: %s: Name of current post */
-			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
+			sprintf(__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen'), '<span class="screen-reader-text">'.get_the_title(get_the_ID()).'</span>')
 		);
-	return ' &hellip; ' . $link;
+	return ' &hellip; '.$link;
 }
-add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
+add_filter('excerpt_more', 'twentythirteen_excerpt_more');
 endif;
 
 /**
@@ -498,19 +498,19 @@ 
  * @param array $classes A list of existing body class values.
  * @return array The filtered body class list.
  */
-function twentythirteen_body_class( $classes ) {
-	if ( ! is_multi_author() )
+function twentythirteen_body_class($classes) {
+	if ( ! is_multi_author())
 		$classes[] = 'single-author';
 
-	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() )
+	if (is_active_sidebar('sidebar-2') && ! is_attachment() && ! is_404())
 		$classes[] = 'sidebar';
 
-	if ( ! get_option( 'show_avatars' ) )
+	if ( ! get_option('show_avatars'))
 		$classes[] = 'no-avatars';
 
 	return $classes;
 }
-add_filter( 'body_class', 'twentythirteen_body_class' );
+add_filter('body_class', 'twentythirteen_body_class');
 
 /**
  * Adjust content_width value for video post formats and attachment templates.
@@ -520,12 +520,12 @@ 
 function twentythirteen_content_width() {
 	global $content_width;
 
-	if ( is_attachment() )
+	if (is_attachment())
 		$content_width = 724;
-	elseif ( has_post_format( 'audio' ) )
+	elseif (has_post_format('audio'))
 		$content_width = 484;
 }
-add_action( 'template_redirect', 'twentythirteen_content_width' );
+add_action('template_redirect', 'twentythirteen_content_width');
 
 /**
  * Add postMessage support for site title and description for the Customizer.
@@ -534,25 +534,25 @@ 
  *
  * @param WP_Customize_Manager $wp_customize Customizer object.
  */
-function twentythirteen_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
-	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
+function twentythirteen_customize_register($wp_customize) {
+	$wp_customize->get_setting('blogname')->transport         = 'postMessage';
+	$wp_customize->get_setting('blogdescription')->transport  = 'postMessage';
+	$wp_customize->get_setting('header_textcolor')->transport = 'postMessage';
 
-	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
+	if (isset($wp_customize->selective_refresh)) {
+		$wp_customize->selective_refresh->add_partial('blogname', array(
 			'selector' => '.site-title',
 			'container_inclusive' => false,
 			'render_callback' => 'twentythirteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+		));
+		$wp_customize->selective_refresh->add_partial('blogdescription', array(
 			'selector' => '.site-description',
 			'container_inclusive' => false,
 			'render_callback' => 'twentythirteen_customize_partial_blogdescription',
-		) );
+		));
 	}
 }
-add_action( 'customize_register', 'twentythirteen_customize_register' );
+add_action('customize_register', 'twentythirteen_customize_register');
 
 /**
  * Render the site title for the selective refresh partial.
@@ -563,7 +563,7 @@ 
  * @return void
  */
 function twentythirteen_customize_partial_blogname() {
-	bloginfo( 'name' );
+	bloginfo('name');
 }
 
 /**
@@ -575,7 +575,7 @@ 
  * @return void
  */
 function twentythirteen_customize_partial_blogdescription() {
-	bloginfo( 'description' );
+	bloginfo('description');
 }
 
 /**
@@ -587,6 +587,6 @@ 
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_customize_preview_js() {
-	wp_enqueue_script( 'twentythirteen-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20141120', true );
+	wp_enqueue_script('twentythirteen-customizer', get_template_directory_uri().'/js/theme-customizer.js', array('customize-preview'), '20141120', true);
 }
-add_action( 'customize_preview_init', 'twentythirteen_customize_preview_js' );
+add_action('customize_preview_init', 'twentythirteen_customize_preview_js');

src/wp-content/themes/twentytwelve/functions.php

Spacing +121 added lines, -121 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Set up the content width value based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset($content_width))
 	$content_width = 625;
 
 /**
@@ -49,41 +49,41 @@ 
 	 * If you're building a theme based on Twenty Twelve, use a find and replace
 	 * to change 'twentytwelve' to the name of your theme in all the template files.
 	 */
-	load_theme_textdomain( 'twentytwelve' );
+	load_theme_textdomain('twentytwelve');
 
 	// This theme styles the visual editor with editor-style.css to match the theme style.
 	add_editor_style();
 
 	// Adds RSS feed links to <head> for posts and comments.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	// This theme supports a variety of post formats.
-	add_theme_support( 'post-formats', array( 'aside', 'image', 'link', 'quote', 'status' ) );
+	add_theme_support('post-formats', array('aside', 'image', 'link', 'quote', 'status'));
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Primary Menu', 'twentytwelve' ) );
+	register_nav_menu('primary', __('Primary Menu', 'twentytwelve'));
 
 	/*
 	 * This theme supports custom background color and image,
 	 * and here we also set up the default background color.
 	 */
-	add_theme_support( 'custom-background', array(
+	add_theme_support('custom-background', array(
 		'default-color' => 'e6e6e6',
-	) );
+	));
 
 	// This theme uses a custom image size for featured images, displayed on "standard" posts.
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 624, 9999 ); // Unlimited height, soft crop
+	add_theme_support('post-thumbnails');
+	set_post_thumbnail_size(624, 9999); // Unlimited height, soft crop
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
+	add_theme_support('customize-selective-refresh-widgets');
 }
-add_action( 'after_setup_theme', 'twentytwelve_setup' );
+add_action('after_setup_theme', 'twentytwelve_setup');
 
 /**
  * Add support for a custom header image.
  */
-require( get_template_directory() . '/inc/custom-header.php' );
+require(get_template_directory().'/inc/custom-header.php');
 
 /**
  * Return the Google font stylesheet URL if available.
@@ -101,26 +101,26 @@ 
 	/* translators: If there are characters in your language that are not supported
 	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
+	if ('off' !== _x('on', 'Open Sans font: on or off', 'twentytwelve')) {
 		$subsets = 'latin,latin-ext';
 
 		/* translators: To add an additional Open Sans character subset specific to your language,
 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 		 */
-		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
+		$subset = _x('no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve');
 
-		if ( 'cyrillic' == $subset )
+		if ('cyrillic' == $subset)
 			$subsets .= ',cyrillic,cyrillic-ext';
-		elseif ( 'greek' == $subset )
+		elseif ('greek' == $subset)
 			$subsets .= ',greek,greek-ext';
-		elseif ( 'vietnamese' == $subset )
+		elseif ('vietnamese' == $subset)
 			$subsets .= ',vietnamese';
 
 		$query_args = array(
 			'family' => 'Open+Sans:400italic,700italic,400,700',
 			'subset' => $subsets,
 		);
-		$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$font_url = add_query_arg($query_args, 'https://fonts.googleapis.com/css');
 	}
 
 	return $font_url;
@@ -138,24 +138,24 @@ 
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments'))
+		wp_enqueue_script('comment-reply');
 
 	// Adds JavaScript for handling the navigation menu hide-and-show behavior.
-	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
+	wp_enqueue_script('twentytwelve-navigation', get_template_directory_uri().'/js/navigation.js', array('jquery'), '20140711', true);
 
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
-		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	if ( ! empty($font_url))
+		wp_enqueue_style('twentytwelve-fonts', esc_url_raw($font_url), array(), null);
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
+	wp_enqueue_style('twentytwelve-style', get_stylesheet_uri());
 
 	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
-	$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
+	wp_enqueue_style('twentytwelve-ie', get_template_directory_uri().'/css/ie.css', array('twentytwelve-style'), '20121010');
+	$wp_styles->add_data('twentytwelve-ie', 'conditional', 'lt IE 9');
 }
-add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
+add_action('wp_enqueue_scripts', 'twentytwelve_scripts_styles');
 
 /**
  * Filter TinyMCE CSS path to include Google Fonts.
@@ -169,20 +169,20 @@ 
  * @param string $mce_css CSS path to load in TinyMCE.
  * @return string Filtered CSS path.
  */
-function twentytwelve_mce_css( $mce_css ) {
+function twentytwelve_mce_css($mce_css) {
 	$font_url = twentytwelve_get_font_url();
 
-	if ( empty( $font_url ) )
+	if (empty($font_url))
 		return $mce_css;
 
-	if ( ! empty( $mce_css ) )
+	if ( ! empty($mce_css))
 		$mce_css .= ',';
 
-	$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
+	$mce_css .= esc_url_raw(str_replace(',', '%2C', $font_url));
 
 	return $mce_css;
 }
-add_filter( 'mce_css', 'twentytwelve_mce_css' );
+add_filter('mce_css', 'twentytwelve_mce_css');
 
 /**
  * Filter the page title.
@@ -196,27 +196,27 @@ 
  * @param string $sep Optional separator.
  * @return string Filtered title.
  */
-function twentytwelve_wp_title( $title, $sep ) {
+function twentytwelve_wp_title($title, $sep) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if (is_feed())
 		return $title;
 
 	// Add the site name.
-	$title .= get_bloginfo( 'name', 'display' );
+	$title .= get_bloginfo('name', 'display');
 
 	// Add the site description for the home/front page.
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	$site_description = get_bloginfo('description', 'display');
+	if ($site_description && (is_home() || is_front_page()))
 		$title = "$title $sep $site_description";
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
+	if (($paged >= 2 || $page >= 2) && ! is_404())
+		$title = "$title $sep ".sprintf(__('Page %s', 'twentytwelve'), max($paged, $page));
 
 	return $title;
 }
-add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
+add_filter('wp_title', 'twentytwelve_wp_title', 10, 2);
 
 /**
  * Filter the page menu arguments.
@@ -225,12 +225,12 @@ 
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+function twentytwelve_page_menu_args($args) {
+	if ( ! isset($args['show_home']))
 		$args['show_home'] = true;
 	return $args;
 }
-add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
+add_filter('wp_page_menu_args', 'twentytwelve_page_menu_args');
 
 /**
  * Register sidebars.
@@ -240,58 +240,58 @@ 
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_widgets_init() {
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentytwelve' ),
+	register_sidebar(array(
+		'name' => __('Main Sidebar', 'twentytwelve'),
 		'id' => 'sidebar-1',
-		'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
+		'description' => __('Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
+	register_sidebar(array(
+		'name' => __('First Front Page Widget Area', 'twentytwelve'),
 		'id' => 'sidebar-2',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+		'description' => __('Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
+	register_sidebar(array(
+		'name' => __('Second Front Page Widget Area', 'twentytwelve'),
 		'id' => 'sidebar-3',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+		'description' => __('Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentytwelve_widgets_init' );
+add_action('widgets_init', 'twentytwelve_widgets_init');
 
-if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
+if ( ! function_exists('twentytwelve_content_nav')) :
 /**
  * Displays navigation to next/previous pages when applicable.
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_content_nav( $html_id ) {
+function twentytwelve_content_nav($html_id) {
 	global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
+	if ($wp_query->max_num_pages > 1) : ?>
+		<nav id="<?php echo esc_attr($html_id); ?>" class="navigation" role="navigation">
+			<h3 class="assistive-text"><?php _e('Post navigation', 'twentytwelve'); ?></h3>
+			<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve')); ?></div>
+			<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve')); ?></div>
 		</nav><!-- .navigation -->
 	<?php endif;
 }
 endif;
 
-if ( ! function_exists( 'twentytwelve_comment' ) ) :
+if ( ! function_exists('twentytwelve_comment')) :
 /**
  * Template for comments and pingbacks.
  *
@@ -302,15 +302,15 @@ 
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_comment( $comment, $args, $depth ) {
+function twentytwelve_comment($comment, $args, $depth) {
 	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
+	switch ($comment->comment_type) :
 		case 'pingback' :
 		case 'trackback' :
 		// Display trackbacks differently than normal comments.
 	?>
 	<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
-		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
+		<p><?php _e('Pingback:', 'twentytwelve'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'twentytwelve'), '<span class="edit-link">', '</span>'); ?></p>
 	<?php
 			break;
 		default :
@@ -321,32 +321,32 @@ 
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<header class="comment-meta comment-author vcard">
 				<?php
-					echo get_avatar( $comment, 44 );
-					printf( '<cite><b class="fn">%1$s</b> %2$s</cite>',
+					echo get_avatar($comment, 44);
+					printf('<cite><b class="fn">%1$s</b> %2$s</cite>',
 						get_comment_author_link(),
 						// If current post author is also comment author, make it known visually.
-						( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
+						($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'twentytwelve').'</span>' : ''
 					);
-					printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
-						esc_url( get_comment_link( $comment->comment_ID ) ),
-						get_comment_time( 'c' ),
+					printf('<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+						esc_url(get_comment_link($comment->comment_ID)),
+						get_comment_time('c'),
 						/* translators: 1: date, 2: time */
-						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
+						sprintf(__('%1$s at %2$s', 'twentytwelve'), get_comment_date(), get_comment_time())
 					);
 				?>
 			</header><!-- .comment-meta -->
 
-			<?php if ( '0' == $comment->comment_approved ) : ?>
-				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
+			<?php if ('0' == $comment->comment_approved) : ?>
+				<p class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.', 'twentytwelve'); ?></p>
 			<?php endif; ?>
 
 			<section class="comment-content comment">
 				<?php comment_text(); ?>
-				<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
+				<?php edit_comment_link(__('Edit', 'twentytwelve'), '<p class="edit-link">', '</p>'); ?>
 			</section><!-- .comment-content -->
 
 			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+				<?php comment_reply_link(array_merge($args, array('reply_text' => __('Reply', 'twentytwelve'), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth']))); ?>
 			</div><!-- .reply -->
 		</article><!-- #comment-## -->
 	<?php
@@ -355,7 +355,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
+if ( ! function_exists('twentytwelve_entry_meta')) :
 /**
  * Set up post entry meta.
  *
@@ -367,31 +367,31 @@ 
  */
 function twentytwelve_entry_meta() {
 	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+	$categories_list = get_the_category_list(__(', ', 'twentytwelve'));
 
 	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+	$tag_list = get_the_tag_list('', __(', ', 'twentytwelve'));
 
-	$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() )
+	$date = sprintf('<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
+		esc_url(get_permalink()),
+		esc_attr(get_the_time()),
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date())
 	);
 
-	$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
+	$author = sprintf('<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+		esc_url(get_author_posts_url(get_the_author_meta('ID'))),
+		esc_attr(sprintf(__('View all posts by %s', 'twentytwelve'), get_the_author())),
 		get_the_author()
 	);
 
 	// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
-	if ( $tag_list ) {
-		$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} elseif ( $categories_list ) {
-		$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+	if ($tag_list) {
+		$utility_text = __('This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve');
+	} elseif ($categories_list) {
+		$utility_text = __('This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve');
 	} else {
-		$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		$utility_text = __('This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve');
 	}
 
 	printf(
@@ -421,38 +421,38 @@ 
  * @param array $classes Existing class values.
  * @return array Filtered class values.
  */
-function twentytwelve_body_class( $classes ) {
+function twentytwelve_body_class($classes) {
 	$background_color = get_background_color();
 	$background_image = get_background_image();
 
-	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
+	if ( ! is_active_sidebar('sidebar-1') || is_page_template('page-templates/full-width.php'))
 		$classes[] = 'full-width';
 
-	if ( is_page_template( 'page-templates/front-page.php' ) ) {
+	if (is_page_template('page-templates/front-page.php')) {
 		$classes[] = 'template-front-page';
-		if ( has_post_thumbnail() )
+		if (has_post_thumbnail())
 			$classes[] = 'has-post-thumbnail';
-		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+		if (is_active_sidebar('sidebar-2') && is_active_sidebar('sidebar-3'))
 			$classes[] = 'two-sidebars';
 	}
 
-	if ( empty( $background_image ) ) {
-		if ( empty( $background_color ) )
+	if (empty($background_image)) {
+		if (empty($background_color))
 			$classes[] = 'custom-background-empty';
-		elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
+		elseif (in_array($background_color, array('fff', 'ffffff')))
 			$classes[] = 'custom-background-white';
 	}
 
 	// Enable custom font class only if the font CSS is queued to load.
-	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
+	if (wp_style_is('twentytwelve-fonts', 'queue'))
 		$classes[] = 'custom-font-enabled';
 
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author())
 		$classes[] = 'single-author';
 
 	return $classes;
 }
-add_filter( 'body_class', 'twentytwelve_body_class' );
+add_filter('body_class', 'twentytwelve_body_class');
 
 /**
  * Adjust content width in certain contexts.
@@ -463,12 +463,12 @@ 
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_content_width() {
-	if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
+	if (is_page_template('page-templates/full-width.php') || is_attachment() || ! is_active_sidebar('sidebar-1')) {
 		global $content_width;
 		$content_width = 960;
 	}
 }
-add_action( 'template_redirect', 'twentytwelve_content_width' );
+add_action('template_redirect', 'twentytwelve_content_width');
 
 /**
  * Register postMessage support.
@@ -479,25 +479,25 @@ 
  *
  * @param WP_Customize_Manager $wp_customize Customizer object.
  */
-function twentytwelve_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
-	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
+function twentytwelve_customize_register($wp_customize) {
+	$wp_customize->get_setting('blogname')->transport         = 'postMessage';
+	$wp_customize->get_setting('blogdescription')->transport  = 'postMessage';
+	$wp_customize->get_setting('header_textcolor')->transport = 'postMessage';
 
-	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
+	if (isset($wp_customize->selective_refresh)) {
+		$wp_customize->selective_refresh->add_partial('blogname', array(
 			'selector' => '.site-title > a',
 			'container_inclusive' => false,
 			'render_callback' => 'twentytwelve_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+		));
+		$wp_customize->selective_refresh->add_partial('blogdescription', array(
 			'selector' => '.site-description',
 			'container_inclusive' => false,
 			'render_callback' => 'twentytwelve_customize_partial_blogdescription',
-		) );
+		));
 	}
 }
-add_action( 'customize_register', 'twentytwelve_customize_register' );
+add_action('customize_register', 'twentytwelve_customize_register');
 
 /**
  * Render the site title for the selective refresh partial.
@@ -508,7 +508,7 @@ 
  * @return void
  */
 function twentytwelve_customize_partial_blogname() {
-	bloginfo( 'name' );
+	bloginfo('name');
 }
 
 /**
@@ -520,7 +520,7 @@ 
  * @return void
  */
 function twentytwelve_customize_partial_blogdescription() {
-	bloginfo( 'description' );
+	bloginfo('description');
 }
 
 /**
@@ -531,6 +531,6 @@ 
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_customize_preview_js() {
-	wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20141120', true );
+	wp_enqueue_script('twentytwelve-customizer', get_template_directory_uri().'/js/theme-customizer.js', array('customize-preview'), '20141120', true);
 }
-add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
+add_action('customize_preview_init', 'twentytwelve_customize_preview_js');

src/wp-content/themes/twentyfifteen/functions.php

Spacing +85 added lines, -85 removed lines

@@ -30,18 +30,18 @@ 
  *
  * @since Twenty Fifteen 1.0
  */
-if ( ! isset( $content_width ) ) {
+if ( ! isset($content_width)) {
 	$content_width = 660;
 }
 
 /**
  * Twenty Fifteen only works in WordPress 4.1 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '4.1-alpha', '<' ) ) {
-	require get_template_directory() . '/inc/back-compat.php';
+if (version_compare($GLOBALS['wp_version'], '4.1-alpha', '<')) {
+	require get_template_directory().'/inc/back-compat.php';
 }
 
-if ( ! function_exists( 'twentyfifteen_setup' ) ) :
+if ( ! function_exists('twentyfifteen_setup')) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -59,10 +59,10 @@ 
 	 * If you're building a theme based on twentyfifteen, use a find and replace
 	 * to change 'twentyfifteen' to the name of your theme in all the template files
 	 */
-	load_theme_textdomain( 'twentyfifteen' );
+	load_theme_textdomain('twentyfifteen');
 
 	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	/*
 	 * Let WordPress manage the document title.
@@ -70,70 +70,70 @@ 
 	 * hard-coded <title> tag in the document head, and expect WordPress to
 	 * provide it for us.
 	 */
-	add_theme_support( 'title-tag' );
+	add_theme_support('title-tag');
 
 	/*
 	 * Enable support for Post Thumbnails on posts and pages.
 	 *
 	 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
 	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 825, 510, true );
+	add_theme_support('post-thumbnails');
+	set_post_thumbnail_size(825, 510, true);
 
 	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu',      'twentyfifteen' ),
-		'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
-	) );
+	register_nav_menus(array(
+		'primary' => __('Primary Menu', 'twentyfifteen'),
+		'social'  => __('Social Links Menu', 'twentyfifteen'),
+	));
 
 	/*
 	 * Switch default core markup for search form, comment form, and comments
 	 * to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
+	add_theme_support('html5', array(
 		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	));
 
 	/*
 	 * Enable support for Post Formats.
 	 *
 	 * See: https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
+	add_theme_support('post-formats', array(
 		'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
-	) );
+	));
 
 	/*
 	 * Enable support for custom logo.
 	 *
 	 * @since Twenty Fifteen 1.5
 	 */
-	add_theme_support( 'custom-logo', array(
+	add_theme_support('custom-logo', array(
 		'height'      => 248,
 		'width'       => 248,
 		'flex-height' => true,
-	) );
+	));
 
 	$color_scheme  = twentyfifteen_get_color_scheme();
-	$default_color = trim( $color_scheme[0], '#' );
+	$default_color = trim($color_scheme[0], '#');
 
 	// Setup the WordPress core custom background feature.
-	add_theme_support( 'custom-background', apply_filters( 'twentyfifteen_custom_background_args', array(
+	add_theme_support('custom-background', apply_filters('twentyfifteen_custom_background_args', array(
 		'default-color'      => $default_color,
 		'default-attachment' => 'fixed',
-	) ) );
+	)));
 
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
 	 * specifically font, colors, icons, and column width.
 	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+	add_editor_style(array('css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url()));
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
+	add_theme_support('customize-selective-refresh-widgets');
 }
 endif; // twentyfifteen_setup
-add_action( 'after_setup_theme', 'twentyfifteen_setup' );
+add_action('after_setup_theme', 'twentyfifteen_setup');
 
 /**
  * Register widget area.
@@ -143,19 +143,19 @@ 
  * @link https://codex.wordpress.org/Function_Reference/register_sidebar
  */
 function twentyfifteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Widget Area', 'twentyfifteen' ),
+	register_sidebar(array(
+		'name'          => __('Widget Area', 'twentyfifteen'),
 		'id'            => 'sidebar-1',
-		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyfifteen' ),
+		'description'   => __('Add widgets here to appear in your sidebar.', 'twentyfifteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h2 class="widget-title">',
 		'after_title'   => '</h2>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
+add_action('widgets_init', 'twentyfifteen_widgets_init');
 
-if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
+if ( ! function_exists('twentyfifteen_fonts_url')) :
 /**
  * Register Google fonts for Twenty Fifteen.
  *
@@ -172,7 +172,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Noto Sans font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Noto Sans:400italic,700italic,400,700';
 	}
 
@@ -180,7 +180,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Noto Serif font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Noto Serif:400italic,700italic,400,700';
 	}
 
@@ -188,7 +188,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Inconsolata font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Inconsolata:400,700';
 	}
 
@@ -196,23 +196,23 @@ 
 	 * Translators: To add an additional character subset specific to your language,
 	 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
 	 */
-	$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+	$subset = _x('no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen');
 
-	if ( 'cyrillic' == $subset ) {
+	if ('cyrillic' == $subset) {
 		$subsets .= ',cyrillic,cyrillic-ext';
-	} elseif ( 'greek' == $subset ) {
+	} elseif ('greek' == $subset) {
 		$subsets .= ',greek,greek-ext';
-	} elseif ( 'devanagari' == $subset ) {
+	} elseif ('devanagari' == $subset) {
 		$subsets .= ',devanagari';
-	} elseif ( 'vietnamese' == $subset ) {
+	} elseif ('vietnamese' == $subset) {
 		$subsets .= ',vietnamese';
 	}
 
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
+	if ($fonts) {
+		$fonts_url = add_query_arg(array(
+			'family' => urlencode(implode('|', $fonts)),
+			'subset' => urlencode($subsets),
+		), 'https://fonts.googleapis.com/css');
 	}
 
 	return $fonts_url;
@@ -229,7 +229,7 @@ 
 function twentyfifteen_javascript_detection() {
 	echo "<script>(function(html){html.className = html.className.replace(/\bno-js\b/,'js')})(document.documentElement);</script>\n";
 }
-add_action( 'wp_head', 'twentyfifteen_javascript_detection', 0 );
+add_action('wp_head', 'twentyfifteen_javascript_detection', 0);
 
 /**
  * Enqueue scripts and styles.
@@ -238,39 +238,39 @@ 
  */
 function twentyfifteen_scripts() {
 	// Add custom fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+	wp_enqueue_style('twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null);
 
 	// Add Genericons, used in the main stylesheet.
-	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.2' );
+	wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.2');
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri() );
+	wp_enqueue_style('twentyfifteen-style', get_stylesheet_uri());
 
 	// Load the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20141010' );
-	wp_style_add_data( 'twentyfifteen-ie', 'conditional', 'lt IE 9' );
+	wp_enqueue_style('twentyfifteen-ie', get_template_directory_uri().'/css/ie.css', array('twentyfifteen-style'), '20141010');
+	wp_style_add_data('twentyfifteen-ie', 'conditional', 'lt IE 9');
 
 	// Load the Internet Explorer 7 specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), '20141010' );
-	wp_style_add_data( 'twentyfifteen-ie7', 'conditional', 'lt IE 8' );
+	wp_enqueue_style('twentyfifteen-ie7', get_template_directory_uri().'/css/ie7.css', array('twentyfifteen-style'), '20141010');
+	wp_style_add_data('twentyfifteen-ie7', 'conditional', 'lt IE 8');
 
-	wp_enqueue_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20141010', true );
+	wp_enqueue_script('twentyfifteen-skip-link-focus-fix', get_template_directory_uri().'/js/skip-link-focus-fix.js', array(), '20141010', true);
 
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments')) {
+		wp_enqueue_script('comment-reply');
 	}
 
-	if ( is_singular() && wp_attachment_is_image() ) {
-		wp_enqueue_script( 'twentyfifteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20141010' );
+	if (is_singular() && wp_attachment_is_image()) {
+		wp_enqueue_script('twentyfifteen-keyboard-image-navigation', get_template_directory_uri().'/js/keyboard-image-navigation.js', array('jquery'), '20141010');
 	}
 
-	wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true );
-	wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
-		'expand'   => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
-		'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
-	) );
+	wp_enqueue_script('twentyfifteen-script', get_template_directory_uri().'/js/functions.js', array('jquery'), '20150330', true);
+	wp_localize_script('twentyfifteen-script', 'screenReaderText', array(
+		'expand'   => '<span class="screen-reader-text">'.__('expand child menu', 'twentyfifteen').'</span>',
+		'collapse' => '<span class="screen-reader-text">'.__('collapse child menu', 'twentyfifteen').'</span>',
+	));
 }
-add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
+add_action('wp_enqueue_scripts', 'twentyfifteen_scripts');
 
 /**
  * Add featured image as background image to post navigation elements.
@@ -280,39 +280,39 @@ 
  * @see wp_add_inline_style()
  */
 function twentyfifteen_post_nav_background() {
-	if ( ! is_single() ) {
+	if ( ! is_single()) {
 		return;
 	}
 
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	$previous = (is_attachment()) ? get_post(get_post()->post_parent) : get_adjacent_post(false, '', true);
+	$next     = get_adjacent_post(false, '', false);
 	$css      = '';
 
-	if ( is_attachment() && 'attachment' == $previous->post_type ) {
+	if (is_attachment() && 'attachment' == $previous->post_type) {
 		return;
 	}
 
-	if ( $previous &&  has_post_thumbnail( $previous->ID ) ) {
-		$prevthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $previous->ID ), 'post-thumbnail' );
+	if ($previous && has_post_thumbnail($previous->ID)) {
+		$prevthumb = wp_get_attachment_image_src(get_post_thumbnail_id($previous->ID), 'post-thumbnail');
 		$css .= '
-			.post-navigation .nav-previous { background-image: url(' . esc_url( $prevthumb[0] ) . '); }
+			.post-navigation .nav-previous { background-image: url(' . esc_url($prevthumb[0]).'); }
 			.post-navigation .nav-previous .post-title, .post-navigation .nav-previous a:hover .post-title, .post-navigation .nav-previous .meta-nav { color: #fff; }
 			.post-navigation .nav-previous a:before { background-color: rgba(0, 0, 0, 0.4); }
 		';
 	}
 
-	if ( $next && has_post_thumbnail( $next->ID ) ) {
-		$nextthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $next->ID ), 'post-thumbnail' );
+	if ($next && has_post_thumbnail($next->ID)) {
+		$nextthumb = wp_get_attachment_image_src(get_post_thumbnail_id($next->ID), 'post-thumbnail');
 		$css .= '
-			.post-navigation .nav-next { background-image: url(' . esc_url( $nextthumb[0] ) . '); border-top: 0; }
+			.post-navigation .nav-next { background-image: url(' . esc_url($nextthumb[0]).'); border-top: 0; }
 			.post-navigation .nav-next .post-title, .post-navigation .nav-next a:hover .post-title, .post-navigation .nav-next .meta-nav { color: #fff; }
 			.post-navigation .nav-next a:before { background-color: rgba(0, 0, 0, 0.4); }
 		';
 	}
 
-	wp_add_inline_style( 'twentyfifteen-style', $css );
+	wp_add_inline_style('twentyfifteen-style', $css);
 }
-add_action( 'wp_enqueue_scripts', 'twentyfifteen_post_nav_background' );
+add_action('wp_enqueue_scripts', 'twentyfifteen_post_nav_background');
 
 /**
  * Display descriptions in main navigation.
@@ -325,14 +325,14 @@ 
  * @param array   $args        wp_nav_menu() arguments.
  * @return string Menu item with possible description.
  */
-function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
-	if ( 'primary' == $args->theme_location && $item->description ) {
-		$item_output = str_replace( $args->link_after . '</a>', '<div class="menu-item-description">' . $item->description . '</div>' . $args->link_after . '</a>', $item_output );
+function twentyfifteen_nav_description($item_output, $item, $depth, $args) {
+	if ('primary' == $args->theme_location && $item->description) {
+		$item_output = str_replace($args->link_after.'</a>', '<div class="menu-item-description">'.$item->description.'</div>'.$args->link_after.'</a>', $item_output);
 	}
 
 	return $item_output;
 }
-add_filter( 'walker_nav_menu_start_el', 'twentyfifteen_nav_description', 10, 4 );
+add_filter('walker_nav_menu_start_el', 'twentyfifteen_nav_description', 10, 4);
 
 /**
  * Add a `screen-reader-text` class to the search form's submit button.
@@ -342,28 +342,28 @@ 
  * @param string $html Search form HTML.
  * @return string Modified search form HTML.
  */
-function twentyfifteen_search_form_modify( $html ) {
-	return str_replace( 'class="search-submit"', 'class="search-submit screen-reader-text"', $html );
+function twentyfifteen_search_form_modify($html) {
+	return str_replace('class="search-submit"', 'class="search-submit screen-reader-text"', $html);
 }
-add_filter( 'get_search_form', 'twentyfifteen_search_form_modify' );
+add_filter('get_search_form', 'twentyfifteen_search_form_modify');
 
 /**
  * Implement the Custom Header feature.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/custom-header.php';
+require get_template_directory().'/inc/custom-header.php';
 
 /**
  * Custom template tags for this theme.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/template-tags.php';
+require get_template_directory().'/inc/template-tags.php';
 
 /**
  * Customizer additions.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/customizer.php';
+require get_template_directory().'/inc/customizer.php';

src/wp-content/themes/twentyfourteen/functions.php

Spacing +124 added lines, -124 removed lines

@@ -32,18 +32,18 @@ 
  *
  * @since Twenty Fourteen 1.0
  */
-if ( ! isset( $content_width ) ) {
+if ( ! isset($content_width)) {
 	$content_width = 474;
 }
 
 /**
  * Twenty Fourteen only works in WordPress 3.6 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '3.6', '<' ) ) {
-	require get_template_directory() . '/inc/back-compat.php';
+if (version_compare($GLOBALS['wp_version'], '3.6', '<')) {
+	require get_template_directory().'/inc/back-compat.php';
 }
 
-if ( ! function_exists( 'twentyfourteen_setup' ) ) :
+if ( ! function_exists('twentyfourteen_setup')) :
 /**
  * Twenty Fourteen setup.
  *
@@ -65,60 +65,60 @@ 
 	 * replace to change 'twentyfourteen' to the name of your theme in all
 	 * template files.
 	 */
-	load_theme_textdomain( 'twentyfourteen' );
+	load_theme_textdomain('twentyfourteen');
 
 	// This theme styles the visual editor to resemble the theme style.
-	add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
+	add_editor_style(array('css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css'));
 
 	// Add RSS feed links to <head> for posts and comments.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	// Enable support for Post Thumbnails, and declare two sizes.
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 672, 372, true );
-	add_image_size( 'twentyfourteen-full-width', 1038, 576, true );
+	add_theme_support('post-thumbnails');
+	set_post_thumbnail_size(672, 372, true);
+	add_image_size('twentyfourteen-full-width', 1038, 576, true);
 
 	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
-		'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
-	) );
+	register_nav_menus(array(
+		'primary'   => __('Top primary menu', 'twentyfourteen'),
+		'secondary' => __('Secondary menu in left sidebar', 'twentyfourteen'),
+	));
 
 	/*
 	 * Switch default core markup for search form, comment form, and comments
 	 * to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
+	add_theme_support('html5', array(
 		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	));
 
 	/*
 	 * Enable support for Post Formats.
 	 * See https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
+	add_theme_support('post-formats', array(
 		'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery',
-	) );
+	));
 
 	// This theme allows users to set a custom background.
-	add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
+	add_theme_support('custom-background', apply_filters('twentyfourteen_custom_background_args', array(
 		'default-color' => 'f5f5f5',
-	) ) );
+	)));
 
 	// Add support for featured content.
-	add_theme_support( 'featured-content', array(
+	add_theme_support('featured-content', array(
 		'featured_content_filter' => 'twentyfourteen_get_featured_posts',
 		'max_posts' => 6,
-	) );
+	));
 
 	// This theme uses its own gallery styles.
-	add_filter( 'use_default_gallery_style', '__return_false' );
+	add_filter('use_default_gallery_style', '__return_false');
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
+	add_theme_support('customize-selective-refresh-widgets');
 }
 endif; // twentyfourteen_setup
-add_action( 'after_setup_theme', 'twentyfourteen_setup' );
+add_action('after_setup_theme', 'twentyfourteen_setup');
 
 /**
  * Adjust content_width value for image attachment template.
@@ -126,11 +126,11 @@ 
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_content_width() {
-	if ( is_attachment() && wp_attachment_is_image() ) {
+	if (is_attachment() && wp_attachment_is_image()) {
 		$GLOBALS['content_width'] = 810;
 	}
 }
-add_action( 'template_redirect', 'twentyfourteen_content_width' );
+add_action('template_redirect', 'twentyfourteen_content_width');
 
 /**
  * Getter function for Featured Content Plugin.
@@ -147,7 +147,7 @@ 
 	 *
 	 * @param array|bool $posts Array of featured posts, otherwise false.
 	 */
-	return apply_filters( 'twentyfourteen_get_featured_posts', array() );
+	return apply_filters('twentyfourteen_get_featured_posts', array());
 }
 
 /**
@@ -167,38 +167,38 @@ 
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_widgets_init() {
-	require get_template_directory() . '/inc/widgets.php';
-	register_widget( 'Twenty_Fourteen_Ephemera_Widget' );
+	require get_template_directory().'/inc/widgets.php';
+	register_widget('Twenty_Fourteen_Ephemera_Widget');
 
-	register_sidebar( array(
-		'name'          => __( 'Primary Sidebar', 'twentyfourteen' ),
+	register_sidebar(array(
+		'name'          => __('Primary Sidebar', 'twentyfourteen'),
 		'id'            => 'sidebar-1',
-		'description'   => __( 'Main sidebar that appears on the left.', 'twentyfourteen' ),
+		'description'   => __('Main sidebar that appears on the left.', 'twentyfourteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h1 class="widget-title">',
 		'after_title'   => '</h1>',
-	) );
-	register_sidebar( array(
-		'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
+	));
+	register_sidebar(array(
+		'name'          => __('Content Sidebar', 'twentyfourteen'),
 		'id'            => 'sidebar-2',
-		'description'   => __( 'Additional sidebar that appears on the right.', 'twentyfourteen' ),
+		'description'   => __('Additional sidebar that appears on the right.', 'twentyfourteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h1 class="widget-title">',
 		'after_title'   => '</h1>',
-	) );
-	register_sidebar( array(
-		'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
+	));
+	register_sidebar(array(
+		'name'          => __('Footer Widget Area', 'twentyfourteen'),
 		'id'            => 'sidebar-3',
-		'description'   => __( 'Appears in the footer section of the site.', 'twentyfourteen' ),
+		'description'   => __('Appears in the footer section of the site.', 'twentyfourteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h1 class="widget-title">',
 		'after_title'   => '</h1>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
+add_action('widgets_init', 'twentyfourteen_widgets_init');
 
 /**
  * Register Lato Google font for Twenty Fourteen.
@@ -213,12 +213,12 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Lato, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
+	if ('off' !== _x('on', 'Lato font: on or off', 'twentyfourteen')) {
 		$query_args = array(
-			'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
-			'subset' => urlencode( 'latin,latin-ext' ),
+			'family' => urlencode('Lato:300,400,700,900,300italic,400italic,700italic'),
+			'subset' => urlencode('latin,latin-ext'),
 		);
-		$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$font_url = add_query_arg($query_args, 'https://fonts.googleapis.com/css');
 	}
 
 	return $font_url;
@@ -231,41 +231,41 @@ 
  */
 function twentyfourteen_scripts() {
 	// Add Lato font, used in the main stylesheet.
-	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
+	wp_enqueue_style('twentyfourteen-lato', twentyfourteen_font_url(), array(), null);
 
 	// Add Genericons font, used in the main stylesheet.
-	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' );
+	wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.0.3');
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri() );
+	wp_enqueue_style('twentyfourteen-style', get_stylesheet_uri());
 
 	// Load the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131205' );
-	wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
+	wp_enqueue_style('twentyfourteen-ie', get_template_directory_uri().'/css/ie.css', array('twentyfourteen-style'), '20131205');
+	wp_style_add_data('twentyfourteen-ie', 'conditional', 'lt IE 9');
 
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments')) {
+		wp_enqueue_script('comment-reply');
 	}
 
-	if ( is_singular() && wp_attachment_is_image() ) {
-		wp_enqueue_script( 'twentyfourteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20130402' );
+	if (is_singular() && wp_attachment_is_image()) {
+		wp_enqueue_script('twentyfourteen-keyboard-image-navigation', get_template_directory_uri().'/js/keyboard-image-navigation.js', array('jquery'), '20130402');
 	}
 
-	if ( is_active_sidebar( 'sidebar-3' ) ) {
-		wp_enqueue_script( 'jquery-masonry' );
+	if (is_active_sidebar('sidebar-3')) {
+		wp_enqueue_script('jquery-masonry');
 	}
 
-	if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
-		wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true );
-		wp_localize_script( 'twentyfourteen-slider', 'featuredSliderDefaults', array(
-			'prevText' => __( 'Previous', 'twentyfourteen' ),
-			'nextText' => __( 'Next', 'twentyfourteen' )
-		) );
+	if (is_front_page() && 'slider' == get_theme_mod('featured_content_layout')) {
+		wp_enqueue_script('twentyfourteen-slider', get_template_directory_uri().'/js/slider.js', array('jquery'), '20131205', true);
+		wp_localize_script('twentyfourteen-slider', 'featuredSliderDefaults', array(
+			'prevText' => __('Previous', 'twentyfourteen'),
+			'nextText' => __('Next', 'twentyfourteen')
+		));
 	}
 
-	wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150315', true );
+	wp_enqueue_script('twentyfourteen-script', get_template_directory_uri().'/js/functions.js', array('jquery'), '20150315', true);
 }
-add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' );
+add_action('wp_enqueue_scripts', 'twentyfourteen_scripts');
 
 /**
  * Enqueue Google fonts style to admin screen for custom header display.
@@ -273,18 +273,18 @@ 
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_admin_fonts() {
-	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
+	wp_enqueue_style('twentyfourteen-lato', twentyfourteen_font_url(), array(), null);
 }
-add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts' );
+add_action('admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts');
 
-if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
+if ( ! function_exists('twentyfourteen_the_attached_image')) :
 /**
  * Print the attached image with a link to the next attached image.
  *
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_the_attached_image() {
-	$post                = get_post();
+	$post = get_post();
 	/**
 	 * Filter the default Twenty Fourteen attachment size.
 	 *
@@ -297,7 +297,7 @@ 
 	 *     @type int $width  Width of the image in pixels. Default 810.
 	 * }
 	 */
-	$attachment_size     = apply_filters( 'twentyfourteen_attachment_size', array( 810, 810 ) );
+	$attachment_size     = apply_filters('twentyfourteen_attachment_size', array(810, 810));
 	$next_attachment_url = wp_get_attachment_url();
 
 	/*
@@ -306,7 +306,7 @@ 
 	 * looking at the last image in a gallery), or, in a gallery of one, just the
 	 * link to that image file.
 	 */
-	$attachment_ids = get_posts( array(
+	$attachment_ids = get_posts(array(
 		'post_parent'    => $post->post_parent,
 		'fields'         => 'ids',
 		'numberposts'    => -1,
@@ -315,68 +315,68 @@ 
 		'post_mime_type' => 'image',
 		'order'          => 'ASC',
 		'orderby'        => 'menu_order ID',
-	) );
+	));
 
 	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+	if (count($attachment_ids) > 1) {
+		foreach ($attachment_ids as $idx => $attachment_id) {
+			if ($attachment_id == $post->ID) {
+				$next_id = $attachment_ids[($idx + 1) % count($attachment_ids)];
 				break;
 			}
 		}
 
 		// get the URL of the next image attachment...
-		if ( $next_id ) {
-			$next_attachment_url = get_attachment_link( $next_id );
+		if ($next_id) {
+			$next_attachment_url = get_attachment_link($next_id);
 		}
 
 		// or get the URL of the first image attachment.
 		else {
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
+			$next_attachment_url = get_attachment_link(reset($attachment_ids));
 		}
 	}
 
-	printf( '<a href="%1$s" rel="attachment">%2$s</a>',
-		esc_url( $next_attachment_url ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
+	printf('<a href="%1$s" rel="attachment">%2$s</a>',
+		esc_url($next_attachment_url),
+		wp_get_attachment_image($post->ID, $attachment_size)
 	);
 }
 endif;
 
-if ( ! function_exists( 'twentyfourteen_list_authors' ) ) :
+if ( ! function_exists('twentyfourteen_list_authors')) :
 /**
  * Print a list of all site contributors who published at least one post.
  *
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_list_authors() {
-	$contributor_ids = get_users( array(
+	$contributor_ids = get_users(array(
 		'fields'  => 'ID',
 		'orderby' => 'post_count',
 		'order'   => 'DESC',
 		'who'     => 'authors',
-	) );
+	));
 
-	foreach ( $contributor_ids as $contributor_id ) :
-		$post_count = count_user_posts( $contributor_id );
+	foreach ($contributor_ids as $contributor_id) :
+		$post_count = count_user_posts($contributor_id);
 
 		// Move on if user has not published a post (yet).
-		if ( ! $post_count ) {
+		if ( ! $post_count) {
 			continue;
 		}
 	?>
 
 	<div class="contributor">
 		<div class="contributor-info">
-			<div class="contributor-avatar"><?php echo get_avatar( $contributor_id, 132 ); ?></div>
+			<div class="contributor-avatar"><?php echo get_avatar($contributor_id, 132); ?></div>
 			<div class="contributor-summary">
-				<h2 class="contributor-name"><?php echo get_the_author_meta( 'display_name', $contributor_id ); ?></h2>
+				<h2 class="contributor-name"><?php echo get_the_author_meta('display_name', $contributor_id); ?></h2>
 				<p class="contributor-bio">
-					<?php echo get_the_author_meta( 'description', $contributor_id ); ?>
+					<?php echo get_the_author_meta('description', $contributor_id); ?>
 				</p>
-				<a class="button contributor-posts-link" href="<?php echo esc_url( get_author_posts_url( $contributor_id ) ); ?>">
-					<?php printf( _n( '%d Article', '%d Articles', $post_count, 'twentyfourteen' ), $post_count ); ?>
+				<a class="button contributor-posts-link" href="<?php echo esc_url(get_author_posts_url($contributor_id)); ?>">
+					<?php printf(_n('%d Article', '%d Articles', $post_count, 'twentyfourteen'), $post_count); ?>
 				</a>
 			</div><!-- .contributor-summary -->
 		</div><!-- .contributor-info -->
@@ -404,45 +404,45 @@ 
  * @param array $classes A list of existing body class values.
  * @return array The filtered body class list.
  */
-function twentyfourteen_body_classes( $classes ) {
-	if ( is_multi_author() ) {
+function twentyfourteen_body_classes($classes) {
+	if (is_multi_author()) {
 		$classes[] = 'group-blog';
 	}
 
-	if ( get_header_image() ) {
+	if (get_header_image()) {
 		$classes[] = 'header-image';
-	} elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ) ) ) {
+	} elseif ( ! in_array($GLOBALS['pagenow'], array('wp-activate.php', 'wp-signup.php'))) {
 		$classes[] = 'masthead-fixed';
 	}
 
-	if ( is_archive() || is_search() || is_home() ) {
+	if (is_archive() || is_search() || is_home()) {
 		$classes[] = 'list-view';
 	}
 
-	if ( ( ! is_active_sidebar( 'sidebar-2' ) )
-		|| is_page_template( 'page-templates/full-width.php' )
-		|| is_page_template( 'page-templates/contributors.php' )
-		|| is_attachment() ) {
+	if (( ! is_active_sidebar('sidebar-2'))
+		|| is_page_template('page-templates/full-width.php')
+		|| is_page_template('page-templates/contributors.php')
+		|| is_attachment()) {
 		$classes[] = 'full-width';
 	}
 
-	if ( is_active_sidebar( 'sidebar-3' ) ) {
+	if (is_active_sidebar('sidebar-3')) {
 		$classes[] = 'footer-widgets';
 	}
 
-	if ( is_singular() && ! is_front_page() ) {
+	if (is_singular() && ! is_front_page()) {
 		$classes[] = 'singular';
 	}
 
-	if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
+	if (is_front_page() && 'slider' == get_theme_mod('featured_content_layout')) {
 		$classes[] = 'slider';
-	} elseif ( is_front_page() ) {
+	} elseif (is_front_page()) {
 		$classes[] = 'grid';
 	}
 
 	return $classes;
 }
-add_filter( 'body_class', 'twentyfourteen_body_classes' );
+add_filter('body_class', 'twentyfourteen_body_classes');
 
 /**
  * Extend the default WordPress post classes.
@@ -455,14 +455,14 @@ 
  * @param array $classes A list of existing post class values.
  * @return array The filtered post class list.
  */
-function twentyfourteen_post_classes( $classes ) {
-	if ( ! post_password_required() && ! is_attachment() && has_post_thumbnail() ) {
+function twentyfourteen_post_classes($classes) {
+	if ( ! post_password_required() && ! is_attachment() && has_post_thumbnail()) {
 		$classes[] = 'has-post-thumbnail';
 	}
 
 	return $classes;
 }
-add_filter( 'post_class', 'twentyfourteen_post_classes' );
+add_filter('post_class', 'twentyfourteen_post_classes');
 
 /**
  * Create a nicely formatted and more specific title element text for output
@@ -477,39 +477,39 @@ 
  * @param string $sep Optional separator.
  * @return string The filtered title.
  */
-function twentyfourteen_wp_title( $title, $sep ) {
+function twentyfourteen_wp_title($title, $sep) {
 	global $paged, $page;
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		return $title;
 	}
 
 	// Add the site name.
-	$title .= get_bloginfo( 'name', 'display' );
+	$title .= get_bloginfo('name', 'display');
 
 	// Add the site description for the home/front page.
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) ) {
+	$site_description = get_bloginfo('description', 'display');
+	if ($site_description && (is_home() || is_front_page())) {
 		$title = "$title $sep $site_description";
 	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentyfourteen' ), max( $paged, $page ) );
+	if (($paged >= 2 || $page >= 2) && ! is_404()) {
+		$title = "$title $sep ".sprintf(__('Page %s', 'twentyfourteen'), max($paged, $page));
 	}
 
 	return $title;
 }
-add_filter( 'wp_title', 'twentyfourteen_wp_title', 10, 2 );
+add_filter('wp_title', 'twentyfourteen_wp_title', 10, 2);
 
 // Implement Custom Header features.
-require get_template_directory() . '/inc/custom-header.php';
+require get_template_directory().'/inc/custom-header.php';
 
 // Custom template tags for this theme.
-require get_template_directory() . '/inc/template-tags.php';
+require get_template_directory().'/inc/template-tags.php';
 
 // Add Customizer functionality.
-require get_template_directory() . '/inc/customizer.php';
+require get_template_directory().'/inc/customizer.php';
 
 /*
  * Add Featured Content functionality.
@@ -517,6 +517,6 @@ 
  * To overwrite in a plugin, define your own Featured_Content class on or
  * before the 'setup_theme' hook.
  */
-if ( ! class_exists( 'Featured_Content' ) && 'plugins.php' !== $GLOBALS['pagenow'] ) {
-	require get_template_directory() . '/inc/featured-content.php';
+if ( ! class_exists('Featured_Content') && 'plugins.php' !== $GLOBALS['pagenow']) {
+	require get_template_directory().'/inc/featured-content.php';
 }

src/xmlrpc.php

Spacing +15 added lines, -15 removed lines

@@ -17,19 +17,19 @@ 
 
 // A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 // but we can do it ourself.
-if ( !isset( $HTTP_RAW_POST_DATA ) ) {
-	$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+if ( ! isset($HTTP_RAW_POST_DATA)) {
+	$HTTP_RAW_POST_DATA = file_get_contents('php://input');
 }
 
 // fix for mozBlog and other cases where '<?xml' isn't on the very first line
-if ( isset($HTTP_RAW_POST_DATA) )
+if (isset($HTTP_RAW_POST_DATA))
 	$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 
 /** Include the bootstrap for setting up WordPress environment */
-include( dirname( __FILE__ ) . '/wp-load.php' );
+include(dirname(__FILE__).'/wp-load.php');
 
-if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+if (isset($_GET['rsd'])) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+header('Content-Type: text/xml; charset='.get_option('blog_charset'), true);
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
@@ -50,7 +50,7 @@ 
 	   *
        * @since 3.5.0
        */
-      do_action( 'xmlrpc_rsd_apis' );
+      do_action('xmlrpc_rsd_apis');
       ?>
     </apis>
   </service>
@@ -59,9 +59,9 @@ 
 exit;
 }
 
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
+include_once(ABSPATH.'wp-admin/includes/admin.php');
+include_once(ABSPATH.WPINC.'/class-IXR.php');
+include_once(ABSPATH.WPINC.'/class-wp-xmlrpc-server.php');
 
 /**
  * Posts submitted via the XML-RPC interface get that title
@@ -77,7 +77,7 @@ 
  *
  * @param string $class The name of the XML-RPC server class.
  */
-$wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
+$wp_xmlrpc_server_class = apply_filters('wp_xmlrpc_server_class', 'wp_xmlrpc_server');
 $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
 
 // Fire off the request
@@ -94,8 +94,8 @@ 
  * @param string $io Whether input or output
  * @param string $msg Information describing logging reason.
  */
-function logIO( $io, $msg ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'error_log()' );
-	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
-		error_log( $io . ' - ' . $msg );
+function logIO($io, $msg) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'error_log()');
+	if ( ! empty($GLOBALS['xmlrpc_logging']))
+		error_log($io.' - '.$msg);
 }
\ No newline at end of file

src/wp-includes/option.php

Spacing +354 added lines, -354 removed lines

@@ -27,11 +27,11 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_option( $option, $default = false ) {
+function get_option($option, $default = false) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
 	/**
@@ -49,17 +49,17 @@ 
 	 *                               Default false to skip it.
 	 * @param string     $option     Option name.
 	 */
-	$pre = apply_filters( 'pre_option_' . $option, false, $option );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_option_'.$option, false, $option);
+	if (false !== $pre)
 		return $pre;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
+	if (defined('WP_SETUP_CONFIG'))
 		return false;
 
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		// prevent non-existent options from triggering multiple queries
-		$notoptions = wp_cache_get( 'notoptions', 'options' );
-		if ( isset( $notoptions[ $option ] ) ) {
+		$notoptions = wp_cache_get('notoptions', 'options');
+		if (isset($notoptions[$option])) {
 			/**
 			 * Filters the default value for an option.
 			 *
@@ -72,53 +72,53 @@ 
 			 *                        in the database.
 			 * @param string $option  Option name.
 			 */
-			return apply_filters( 'default_option_' . $option, $default, $option );
+			return apply_filters('default_option_'.$option, $default, $option);
 		}
 
 		$alloptions = wp_load_alloptions();
 
-		if ( isset( $alloptions[$option] ) ) {
+		if (isset($alloptions[$option])) {
 			$value = $alloptions[$option];
 		} else {
-			$value = wp_cache_get( $option, 'options' );
+			$value = wp_cache_get($option, 'options');
 
-			if ( false === $value ) {
-				$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
+			if (false === $value) {
+				$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
 
 				// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-				if ( is_object( $row ) ) {
+				if (is_object($row)) {
 					$value = $row->option_value;
-					wp_cache_add( $option, $value, 'options' );
+					wp_cache_add($option, $value, 'options');
 				} else { // option does not exist, so we must cache its non-existence
-					if ( ! is_array( $notoptions ) ) {
+					if ( ! is_array($notoptions)) {
 						 $notoptions = array();
 					}
 					$notoptions[$option] = true;
-					wp_cache_set( 'notoptions', $notoptions, 'options' );
+					wp_cache_set('notoptions', $notoptions, 'options');
 
 					/** This filter is documented in wp-includes/option.php */
-					return apply_filters( 'default_option_' . $option, $default, $option );
+					return apply_filters('default_option_'.$option, $default, $option);
 				}
 			}
 		}
 	} else {
 		$suppress = $wpdb->suppress_errors();
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
-		$wpdb->suppress_errors( $suppress );
-		if ( is_object( $row ) ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
+		$wpdb->suppress_errors($suppress);
+		if (is_object($row)) {
 			$value = $row->option_value;
 		} else {
 			/** This filter is documented in wp-includes/option.php */
-			return apply_filters( 'default_option_' . $option, $default, $option );
+			return apply_filters('default_option_'.$option, $default, $option);
 		}
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ('home' == $option && '' == $value)
+		return get_option('siteurl');
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if (in_array($option, array('siteurl', 'home', 'category_base', 'tag_base')))
+		$value = untrailingslashit($value);
 
 	/**
 	 * Filters the value of an existing option.
@@ -133,7 +133,7 @@ 
 	 *                       unserialized prior to being returned.
 	 * @param string $option Option name.
 	 */
-	return apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+	return apply_filters('option_'.$option, maybe_unserialize($value), $option);
 }
 
 /**
@@ -146,9 +146,9 @@ 
  *
  * @param string $option Option name.
  */
-function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+function wp_protect_special_option($option) {
+	if ('alloptions' === $option || 'notoptions' === $option)
+		wp_die(sprintf(__('%s is a protected WP option and may not be modified'), esc_html($option)));
 }
 
 /**
@@ -158,8 +158,8 @@ 
  *
  * @param string $option Option name.
  */
-function form_option( $option ) {
-	echo esc_attr( get_option( $option ) );
+function form_option($option) {
+	echo esc_attr(get_option($option));
 }
 
 /**
@@ -174,22 +174,22 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( ! wp_installing() || ! is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
+	if ( ! wp_installing() || ! is_multisite())
+		$alloptions = wp_cache_get('alloptions', 'options');
 	else
 		$alloptions = false;
 
-	if ( !$alloptions ) {
+	if ( ! $alloptions) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( ! $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'"))
+			$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
-		foreach ( (array) $alloptions_db as $o ) {
+		foreach ((array) $alloptions_db as $o) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( ! wp_installing() || ! is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( ! wp_installing() || ! is_multisite())
+			wp_cache_add('alloptions', $alloptions, 'options');
 	}
 
 	return $alloptions;
@@ -204,26 +204,26 @@ 
  *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
-function wp_load_core_site_options( $site_id = null ) {
+function wp_load_core_site_options($site_id = null) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
+	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing())
 		return;
 
-	if ( empty($site_id) )
+	if (empty($site_id))
 		$site_id = $wpdb->siteid;
 
-	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
+	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting');
 
-	$core_options_in = "'" . implode("', '", $core_options) . "'";
-	$options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
+	$core_options_in = "'".implode("', '", $core_options)."'";
+	$options = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id));
 
-	foreach ( $options as $option ) {
+	foreach ($options as $option) {
 		$key = $option->meta_key;
 		$cache_key = "{$site_id}:$key";
-		$option->meta_value = maybe_unserialize( $option->meta_value );
+		$option->meta_value = maybe_unserialize($option->meta_value);
 
-		wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+		wp_cache_set($cache_key, $option->meta_value, 'site-options');
 	}
 }
 
@@ -250,20 +250,20 @@ 
  *                              the default value is 'yes'. Default null.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_option( $option, $value, $autoload = null ) {
+function update_option($option, $value, $autoload = null) {
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object( $value ) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
-	$old_value = get_option( $option );
+	$value = sanitize_option($option, $value);
+	$old_value = get_option($option);
 
 	/**
 	 * Filters a specific option before its value is (maybe) serialized and updated.
@@ -277,7 +277,7 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param string $option    Option name.
 	 */
-	$value = apply_filters( 'pre_update_option_' . $option, $value, $old_value, $option );
+	$value = apply_filters('pre_update_option_'.$option, $value, $old_value, $option);
 
 	/**
 	 * Filters an option before its value is (maybe) serialized and updated.
@@ -288,23 +288,23 @@ 
 	 * @param string $option    Name of the option.
 	 * @param mixed  $old_value The old option value.
 	 */
-	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
+	$value = apply_filters('pre_update_option', $value, $option, $old_value);
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
+	if ($value === $old_value)
 		return false;
 
 	/** This filter is documented in wp-includes/option.php */
-	if ( apply_filters( 'default_option_' . $option, false, $option ) === $old_value ) {
+	if (apply_filters('default_option_'.$option, false, $option) === $old_value) {
 		// Default setting for new options is 'yes'.
-		if ( null === $autoload ) {
+		if (null === $autoload) {
 			$autoload = 'yes';
 		}
 
-		return add_option( $option, $value, '', $autoload );
+		return add_option($option, $value, '', $autoload);
 	}
 
-	$serialized_value = maybe_serialize( $value );
+	$serialized_value = maybe_serialize($value);
 
 	/**
 	 * Fires immediately before an option value is updated.
@@ -315,33 +315,33 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'update_option', $option, $old_value, $value );
+	do_action('update_option', $option, $old_value, $value);
 
 	$update_args = array(
 		'option_value' => $serialized_value,
 	);
 
-	if ( null !== $autoload ) {
-		$update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	if (null !== $autoload) {
+		$update_args['autoload'] = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 	}
 
-	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
+	$result = $wpdb->update($wpdb->options, $update_args, array('option_name' => $option));
+	if ( ! $result)
 		return false;
 
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$option] ) ) {
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+		if (isset($alloptions[$option])) {
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
@@ -357,7 +357,7 @@ 
 	 * @param mixed  $value     The new option value.
 	 * @param string $option    Option name.
 	 */
-	do_action( "update_option_{$option}", $old_value, $value, $option );
+	do_action("update_option_{$option}", $old_value, $value, $option);
 
 	/**
 	 * Fires after the value of an option has been successfully updated.
@@ -368,7 +368,7 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'updated_option', $option, $old_value, $value );
+	do_action('updated_option', $option, $old_value, $value);
 	return true;
 }
 
@@ -395,32 +395,32 @@ 
  *                                    Default is enabled. Accepts 'no' to disable for legacy reasons.
  * @return bool False if option was not added and true if option was added.
  */
-function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
+function add_option($option, $value = '', $deprecated = '', $autoload = 'yes') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.3.0');
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object($value) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
+	$value = sanitize_option($option, $value);
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if ( ! is_array($notoptions) || ! isset($notoptions[$option]))
 		/** This filter is documented in wp-includes/option.php */
-		if ( apply_filters( 'default_option_' . $option, false, $option ) !== get_option( $option ) )
+		if (apply_filters('default_option_'.$option, false, $option) !== get_option($option))
 			return false;
 
-	$serialized_value = maybe_serialize( $value );
-	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	$serialized_value = maybe_serialize($value);
+	$autoload = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 
 	/**
 	 * Fires before an option is added.
@@ -430,27 +430,27 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'add_option', $option, $value );
+	do_action('add_option', $option, $value);
 
-	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
+	$result = $wpdb->query($wpdb->prepare("INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload));
+	if ( ! $result)
 		return false;
 
-	if ( ! wp_installing() ) {
-		if ( 'yes' == $autoload ) {
+	if ( ! wp_installing()) {
+		if ('yes' == $autoload) {
 			$alloptions = wp_load_alloptions();
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
 	// This option exists now
-	$notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options'); // yes, again... we need it to be fresh
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
 	/**
@@ -464,7 +464,7 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( "add_option_{$option}", $option, $value );
+	do_action("add_option_{$option}", $option, $value);
 
 	/**
 	 * Fires after an option has been added.
@@ -474,7 +474,7 @@ 
 	 * @param string $option Name of the added option.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'added_option', $option, $value );
+	do_action('added_option', $option, $value);
 	return true;
 }
 
@@ -488,18 +488,18 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_option( $option ) {
+function delete_option($option) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	// Get the ID, if no ID then return
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option));
+	if (is_null($row))
 		return false;
 
 	/**
@@ -509,21 +509,21 @@ 
 	 *
 	 * @param string $option Name of the option to delete.
 	 */
-	do_action( 'delete_option', $option );
+	do_action('delete_option', $option);
 
-	$result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
-	if ( ! wp_installing() ) {
-		if ( 'yes' == $row->autoload ) {
+	$result = $wpdb->delete($wpdb->options, array('option_name' => $option));
+	if ( ! wp_installing()) {
+		if ('yes' == $row->autoload) {
 			$alloptions = wp_load_alloptions();
-			if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
-				unset( $alloptions[$option] );
-				wp_cache_set( 'alloptions', $alloptions, 'options' );
+			if (is_array($alloptions) && isset($alloptions[$option])) {
+				unset($alloptions[$option]);
+				wp_cache_set('alloptions', $alloptions, 'options');
 			}
 		} else {
-			wp_cache_delete( $option, 'options' );
+			wp_cache_delete($option, 'options');
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific option has been deleted.
@@ -534,7 +534,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( "delete_option_$option", $option );
+		do_action("delete_option_$option", $option);
 
 		/**
 		 * Fires after an option has been deleted.
@@ -543,7 +543,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( 'deleted_option', $option );
+		do_action('deleted_option', $option);
 		return true;
 	}
 	return false;
@@ -557,7 +557,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool true if successful, false otherwise
  */
-function delete_transient( $transient ) {
+function delete_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific transient is deleted.
@@ -568,19 +568,19 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_transient_' . $transient, $transient );
+	do_action('delete_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'transient');
 	} else {
-		$option_timeout = '_transient_timeout_' . $transient;
-		$option = '_transient_' . $transient;
-		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		$option_timeout = '_transient_timeout_'.$transient;
+		$option = '_transient_'.$transient;
+		$result = delete_option($option);
+		if ($result)
+			delete_option($option_timeout);
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -589,7 +589,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_transient', $transient );
+		do_action('deleted_transient', $transient);
 	}
 
 	return $result;
@@ -606,7 +606,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_transient( $transient ) {
+function get_transient($transient) {
 
 	/**
 	 * Filters the value of an existing transient.
@@ -624,30 +624,30 @@ 
 	 *                              of the transient, and return the returned value.
 	 * @param string $transient     Transient name.
 	 */
-	$pre = apply_filters( 'pre_transient_' . $transient, false, $transient );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_transient_'.$transient, false, $transient);
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'transient');
 	} else {
-		$transient_option = '_transient_' . $transient;
-		if ( ! wp_installing() ) {
+		$transient_option = '_transient_'.$transient;
+		if ( ! wp_installing()) {
 			// If option is not in alloptions, it is not autoloaded and thus has a timeout
 			$alloptions = wp_load_alloptions();
-			if ( !isset( $alloptions[$transient_option] ) ) {
-				$transient_timeout = '_transient_timeout_' . $transient;
-				$timeout = get_option( $transient_timeout );
-				if ( false !== $timeout && $timeout < time() ) {
-					delete_option( $transient_option  );
-					delete_option( $transient_timeout );
+			if ( ! isset($alloptions[$transient_option])) {
+				$transient_timeout = '_transient_timeout_'.$transient;
+				$timeout = get_option($transient_timeout);
+				if (false !== $timeout && $timeout < time()) {
+					delete_option($transient_option);
+					delete_option($transient_timeout);
 					$value = false;
 				}
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_option($transient_option);
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 	 * @param mixed  $value     Value of transient.
 	 * @param string $transient Transient name.
 	 */
-	return apply_filters( 'transient_' . $transient, $value, $transient );
+	return apply_filters('transient_'.$transient, $value, $transient);
 }
 
 /**
@@ -679,7 +679,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0 (no expiration).
  * @return bool False if value was not set and true if value was set.
  */
-function set_transient( $transient, $value, $expiration = 0 ) {
+function set_transient($transient, $value, $expiration = 0) {
 
 	$expiration = (int) $expiration;
 
@@ -696,7 +696,7 @@ 
 	 * @param int    $expiration Time until expiration in seconds.
 	 * @param string $transient  Transient name.
 	 */
-	$value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration, $transient );
+	$value = apply_filters('pre_set_transient_'.$transient, $value, $expiration, $transient);
 
 	/**
 	 * Filters the expiration for a transient before its value is set.
@@ -709,41 +709,41 @@ 
 	 * @param mixed  $value      New value of transient.
 	 * @param string $transient  Transient name.
 	 */
-	$expiration = apply_filters( 'expiration_of_transient_' . $transient, $expiration, $value, $transient );
+	$expiration = apply_filters('expiration_of_transient_'.$transient, $expiration, $value, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'transient', $expiration);
 	} else {
-		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient_option = '_transient_' . $transient;
-		if ( false === get_option( $transient_option ) ) {
+		$transient_timeout = '_transient_timeout_'.$transient;
+		$transient_option = '_transient_'.$transient;
+		if (false === get_option($transient_option)) {
 			$autoload = 'yes';
-			if ( $expiration ) {
+			if ($expiration) {
 				$autoload = 'no';
-				add_option( $transient_timeout, time() + $expiration, '', 'no' );
+				add_option($transient_timeout, time() + $expiration, '', 'no');
 			}
-			$result = add_option( $transient_option, $value, '', $autoload );
+			$result = add_option($transient_option, $value, '', $autoload);
 		} else {
 			// If expiration is requested, but the transient has no timeout option,
 			// delete, then re-create transient rather than update.
 			$update = true;
-			if ( $expiration ) {
-				if ( false === get_option( $transient_timeout ) ) {
-					delete_option( $transient_option );
-					add_option( $transient_timeout, time() + $expiration, '', 'no' );
-					$result = add_option( $transient_option, $value, '', 'no' );
+			if ($expiration) {
+				if (false === get_option($transient_timeout)) {
+					delete_option($transient_option);
+					add_option($transient_timeout, time() + $expiration, '', 'no');
+					$result = add_option($transient_option, $value, '', 'no');
 					$update = false;
 				} else {
-					update_option( $transient_timeout, time() + $expiration );
+					update_option($transient_timeout, time() + $expiration);
 				}
 			}
-			if ( $update ) {
-				$result = update_option( $transient_option, $value );
+			if ($update) {
+				$result = update_option($transient_option, $value);
 			}
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific transient has been set.
@@ -758,7 +758,7 @@ 
 		 * @param int    $expiration Time until expiration in seconds.
 		 * @param string $transient  The name of the transient.
 		 */
-		do_action( 'set_transient_' . $transient, $value, $expiration, $transient );
+		do_action('set_transient_'.$transient, $value, $expiration, $transient);
 
 		/**
 		 * Fires after the value for a transient has been set.
@@ -770,7 +770,7 @@ 
 		 * @param mixed  $value      Transient value.
 		 * @param int    $expiration Time until expiration in seconds.
 		 */
-		do_action( 'setted_transient', $transient, $value, $expiration );
+		do_action('setted_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }
@@ -786,43 +786,43 @@ 
  */
 function wp_user_settings() {
 
-	if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+	if ( ! is_admin() || defined('DOING_AJAX')) {
 		return;
 	}
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
-	$settings = (string) get_user_option( 'user-settings', $user_id );
+	$settings = (string) get_user_option('user-settings', $user_id);
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
 		// No change or both empty
-		if ( $cookie == $settings )
+		if ($cookie == $settings)
 			return;
 
-		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
-		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
+		$last_saved = (int) get_user_option('user-settings-time', $user_id);
+		$current = isset($_COOKIE['wp-settings-time-'.$user_id]) ? preg_replace('/[^0-9]/', '', $_COOKIE['wp-settings-time-'.$user_id]) : 0;
 
 		// The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
-		if ( $current > $last_saved ) {
-			update_user_option( $user_id, 'user-settings', $cookie, false );
-			update_user_option( $user_id, 'user-settings-time', time() - 5, false );
+		if ($current > $last_saved) {
+			update_user_option($user_id, 'user-settings', $cookie, false);
+			update_user_option($user_id, 'user-settings-time', time() - 5, false);
 			return;
 		}
 	}
 
 	// The cookie is not set in the current browser or the saved value is newer.
-	$secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) );
-	setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	$_COOKIE['wp-settings-' . $user_id] = $settings;
+	$secure = ('https' === parse_url(admin_url(), PHP_URL_SCHEME));
+	setcookie('wp-settings-'.$user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	setcookie('wp-settings-time-'.$user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	$_COOKIE['wp-settings-'.$user_id] = $settings;
 }
 
 /**
@@ -834,10 +834,10 @@ 
  * @param string $default Optional default value to return when $name is not set.
  * @return mixed the last saved user setting or the default value/false if it doesn't exist.
  */
-function get_user_setting( $name, $default = false ) {
+function get_user_setting($name, $default = false) {
 	$all_user_settings = get_all_user_settings();
 
-	return isset( $all_user_settings[$name] ) ? $all_user_settings[$name] : $default;
+	return isset($all_user_settings[$name]) ? $all_user_settings[$name] : $default;
 }
 
 /**
@@ -853,15 +853,15 @@ 
  * @param string $value The value for the setting.
  * @return bool|null True if set successfully, false if not. Null if the current user can't be established.
  */
-function set_user_setting( $name, $value ) {
-	if ( headers_sent() ) {
+function set_user_setting($name, $value) {
+	if (headers_sent()) {
 		return false;
 	}
 
 	$all_user_settings = get_all_user_settings();
 	$all_user_settings[$name] = $value;
 
-	return wp_set_all_user_settings( $all_user_settings );
+	return wp_set_all_user_settings($all_user_settings);
 }
 
 /**
@@ -876,8 +876,8 @@ 
  * @param string $names The name or array of names of the setting to be deleted.
  * @return bool|null True if deleted successfully, false if not. Null if the current user can't be established.
  */
-function delete_user_setting( $names ) {
-	if ( headers_sent() ) {
+function delete_user_setting($names) {
+	if (headers_sent()) {
 		return false;
 	}
 
@@ -885,15 +885,15 @@ 
 	$names = (array) $names;
 	$deleted = false;
 
-	foreach ( $names as $name ) {
-		if ( isset( $all_user_settings[$name] ) ) {
-			unset( $all_user_settings[$name] );
+	foreach ($names as $name) {
+		if (isset($all_user_settings[$name])) {
+			unset($all_user_settings[$name]);
 			$deleted = true;
 		}
 	}
 
-	if ( $deleted ) {
-		return wp_set_all_user_settings( $all_user_settings );
+	if ($deleted) {
+		return wp_set_all_user_settings($all_user_settings);
 	}
 
 	return false;
@@ -911,27 +911,27 @@ 
 function get_all_user_settings() {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return array();
 	}
 
-	if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) ) {
+	if (isset($_updated_user_settings) && is_array($_updated_user_settings)) {
 		return $_updated_user_settings;
 	}
 
 	$user_settings = array();
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
-		if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
-			parse_str( $cookie, $user_settings );
+		if (strpos($cookie, '=')) { // '=' cannot be 1st char
+			parse_str($cookie, $user_settings);
 		}
 	} else {
-		$option = get_user_option( 'user-settings', $user_id );
+		$option = get_user_option('user-settings', $user_id);
 
-		if ( $option && is_string( $option ) ) {
-			parse_str( $option, $user_settings );
+		if ($option && is_string($option)) {
+			parse_str($option, $user_settings);
 		}
 	}
 
@@ -951,32 +951,32 @@ 
  * @return bool|null False if the current user can't be found, null if the current
  *                   user is not a super admin or a member of the site, otherwise true.
  */
-function wp_set_all_user_settings( $user_settings ) {
+function wp_set_all_user_settings($user_settings) {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return false;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
 	$settings = '';
-	foreach ( $user_settings as $name => $value ) {
-		$_name = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name );
-		$_value = preg_replace( '/[^A-Za-z0-9_-]+/', '', $value );
+	foreach ($user_settings as $name => $value) {
+		$_name = preg_replace('/[^A-Za-z0-9_-]+/', '', $name);
+		$_value = preg_replace('/[^A-Za-z0-9_-]+/', '', $value);
 
-		if ( ! empty( $_name ) ) {
-			$settings .= $_name . '=' . $_value . '&';
+		if ( ! empty($_name)) {
+			$settings .= $_name.'='.$_value.'&';
 		}
 	}
 
-	$settings = rtrim( $settings, '&' );
-	parse_str( $settings, $_updated_user_settings );
+	$settings = rtrim($settings, '&');
+	parse_str($settings, $_updated_user_settings);
 
-	update_user_option( $user_id, 'user-settings', $settings, false );
-	update_user_option( $user_id, 'user-settings-time', time(), false );
+	update_user_option($user_id, 'user-settings', $settings, false);
+	update_user_option($user_id, 'user-settings-time', time(), false);
 
 	return true;
 }
@@ -987,12 +987,12 @@ 
  * @since 2.7.0
  */
 function delete_all_user_settings() {
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	update_user_option( $user_id, 'user-settings', '', false );
-	setcookie( 'wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+	update_user_option($user_id, 'user-settings', '', false);
+	setcookie('wp-settings-'.$user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
 }
 
 /**
@@ -1009,8 +1009,8 @@ 
  * @param bool   $deprecated Whether to use cache. Multisite only. Always set to true.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $deprecated = true ) {
-	return get_network_option( null, $option, $default );
+function get_site_option($option, $default = false, $deprecated = true) {
+	return get_network_option(null, $option, $default);
 }
 
 /**
@@ -1027,8 +1027,8 @@ 
  * @param mixed  $value  Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if the option was not added. True if the option was added.
  */
-function add_site_option( $option, $value ) {
-	return add_network_option( null, $option, $value );
+function add_site_option($option, $value) {
+	return add_network_option(null, $option, $value);
 }
 
 /**
@@ -1042,8 +1042,8 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_site_option( $option ) {
-	return delete_network_option( null, $option );
+function delete_site_option($option) {
+	return delete_network_option(null, $option);
 }
 
 /**
@@ -1058,8 +1058,8 @@ 
  * @param mixed  $value  Option value. Expected to not be SQL-escaped.
  * @return bool False if value was not updated. True if value was updated.
  */
-function update_site_option( $option, $value ) {
-	return update_network_option( null, $option, $value );
+function update_site_option($option, $value) {
+	return update_network_option(null, $option, $value);
 }
 
 /**
@@ -1077,17 +1077,17 @@ 
  * @param mixed    $default    Optional. Value to return if the option doesn't exist. Default false.
  * @return mixed Value set for the option.
  */
-function get_network_option( $network_id, $option, $default = false ) {
+function get_network_option($network_id, $option, $default = false) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
@@ -1106,17 +1106,17 @@ 
 	 * @param mixed  $pre_option The default value to return if the option does not exist.
 	 * @param string $option     Option name.
 	 */
-	$pre = apply_filters( 'pre_site_option_' . $option, false, $option );
+	$pre = apply_filters('pre_site_option_'.$option, false, $option);
 
-	if ( false !== $pre ) {
+	if (false !== $pre) {
 		return $pre;
 	}
 
 	// prevent non-existent options from triggering multiple queries
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
 
-	if ( isset( $notoptions[ $option ] ) ) {
+	if (isset($notoptions[$option])) {
 
 		/**
 		 * Filters a specific default network option.
@@ -1130,34 +1130,34 @@ 
 		 *                        in the database.
 		 * @param string $option  Option name.
 		 */
-		return apply_filters( 'default_site_option_' . $option, $default, $option );
+		return apply_filters('default_site_option_'.$option, $default, $option);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default, $option );
-		$value = get_option( $option, $default );
+		$default = apply_filters('default_site_option_'.$option, $default, $option);
+		$value = get_option($option, $default);
 	} else {
 		$cache_key = "$network_id:$option";
-		$value = wp_cache_get( $cache_key, 'site-options' );
+		$value = wp_cache_get($cache_key, 'site-options');
 
-		if ( ! isset( $value ) || false === $value ) {
-			$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
+		if ( ! isset($value) || false === $value) {
+			$row = $wpdb->get_row($wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id));
 
 			// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-			if ( is_object( $row ) ) {
+			if (is_object($row)) {
 				$value = $row->meta_value;
-				$value = maybe_unserialize( $value );
-				wp_cache_set( $cache_key, $value, 'site-options' );
+				$value = maybe_unserialize($value);
+				wp_cache_set($cache_key, $value, 'site-options');
 			} else {
-				if ( ! is_array( $notoptions ) ) {
+				if ( ! is_array($notoptions)) {
 					$notoptions = array();
 				}
-				$notoptions[ $option ] = true;
-				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+				$notoptions[$option] = true;
+				wp_cache_set($notoptions_key, $notoptions, 'site-options');
 
 				/** This filter is documented in wp-includes/option.php */
-				$value = apply_filters( 'default_site_option_' . $option, $default, $option );
+				$value = apply_filters('default_site_option_'.$option, $default, $option);
 			}
 		}
 	}
@@ -1174,7 +1174,7 @@ 
 	 * @param mixed  $value  Value of network option.
 	 * @param string $option Option name.
 	 */
-	return apply_filters( 'site_option_' . $option, $value, $option );
+	return apply_filters('site_option_'.$option, $value, $option);
 }
 
 /**
@@ -1194,21 +1194,21 @@ 
  * @param mixed  $value      Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_network_option( $network_id, $option, $value ) {
+function add_network_option($network_id, $option, $value) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	/**
 	 * Filters the value of a specific network option before it is added.
@@ -1222,43 +1222,43 @@ 
 	 * @param mixed  $value  Value of network option.
 	 * @param string $option Option name.
 	 */
-	$value = apply_filters( 'pre_add_site_option_' . $option, $value, $option );
+	$value = apply_filters('pre_add_site_option_'.$option, $value, $option);
 
 	$notoptions_key = "$network_id:notoptions";
 
-	if ( ! is_multisite() ) {
-		$result = add_option( $option, $value, '', 'no' );
+	if ( ! is_multisite()) {
+		$result = add_option($option, $value, '', 'no');
 	} else {
 		$cache_key = "$network_id:$option";
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-		if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
-			if ( false !== get_network_option( $network_id, $option, false ) ) {
+		$notoptions = wp_cache_get($notoptions_key, 'site-options');
+		if ( ! is_array($notoptions) || ! isset($notoptions[$option])) {
+			if (false !== get_network_option($network_id, $option, false)) {
 				return false;
 			}
 		}
 
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->insert($wpdb->sitemeta, array('site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		wp_cache_set( $cache_key, $value, 'site-options' );
+		wp_cache_set($cache_key, $value, 'site-options');
 
 		// This option exists now
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
-		if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
-			unset( $notoptions[ $option ] );
-			wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+		$notoptions = wp_cache_get($notoptions_key, 'site-options'); // yes, again... we need it to be fresh
+		if (is_array($notoptions) && isset($notoptions[$option])) {
+			unset($notoptions[$option]);
+			wp_cache_set($notoptions_key, $notoptions, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific network option has been successfully added.
@@ -1271,7 +1271,7 @@ 
 		 * @param string $option Name of the network option.
 		 * @param mixed  $value  Value of the network option.
 		 */
-		do_action( 'add_site_option_' . $option, $option, $value );
+		do_action('add_site_option_'.$option, $option, $value);
 
 		/**
 		 * Fires after a network option has been successfully added.
@@ -1281,7 +1281,7 @@ 
 		 * @param string $option Name of the network option.
 		 * @param mixed  $value  Value of the network option.
 		 */
-		do_action( 'add_site_option', $option, $value );
+		do_action('add_site_option', $option, $value);
 
 		return true;
 	}
@@ -1303,17 +1303,17 @@ 
  * @param string $option     Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_network_option( $network_id, $option ) {
+function delete_network_option($network_id, $option) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
@@ -1327,22 +1327,22 @@ 
 	 *
 	 * @param string $option Option name.
 	 */
-	do_action( 'pre_delete_site_option_' . $option, $option );
+	do_action('pre_delete_site_option_'.$option, $option);
 
-	if ( ! is_multisite() ) {
-		$result = delete_option( $option );
+	if ( ! is_multisite()) {
+		$result = delete_option($option);
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
-		if ( is_null( $row ) || ! $row->meta_id ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id));
+		if (is_null($row) || ! $row->meta_id) {
 			return false;
 		}
 		$cache_key = "$network_id:$option";
-		wp_cache_delete( $cache_key, 'site-options' );
+		wp_cache_delete($cache_key, 'site-options');
 
-		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) );
+		$result = $wpdb->delete($wpdb->sitemeta, array('meta_key' => $option, 'site_id' => $network_id));
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific network option has been deleted.
@@ -1354,7 +1354,7 @@ 
 		 *
 		 * @param string $option Name of the network option.
 		 */
-		do_action( 'delete_site_option_' . $option, $option );
+		do_action('delete_site_option_'.$option, $option);
 
 		/**
 		 * Fires after a network option has been deleted.
@@ -1363,7 +1363,7 @@ 
 		 *
 		 * @param string $option Name of the network option.
 		 */
-		do_action( 'delete_site_option', $option );
+		do_action('delete_site_option', $option);
 
 		return true;
 	}
@@ -1386,23 +1386,23 @@ 
  * @param mixed    $value      Option value. Expected to not be SQL-escaped.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_network_option( $network_id, $option, $value ) {
+function update_network_option($network_id, $option, $value) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	$old_value = get_network_option( $network_id, $option, false );
+	$old_value = get_network_option($network_id, $option, false);
 
 	/**
 	 * Filters a specific network option before its value is updated.
@@ -1417,38 +1417,38 @@ 
 	 * @param mixed  $old_value Old value of the network option.
 	 * @param string $option    Option name.
 	 */
-	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option );
+	$value = apply_filters('pre_update_site_option_'.$option, $value, $old_value, $option);
 
-	if ( $value === $old_value ) {
+	if ($value === $old_value) {
 		return false;
 	}
 
-	if ( false === $old_value ) {
-		return add_network_option( $network_id, $option, $value );
+	if (false === $old_value) {
+		return add_network_option($network_id, $option, $value);
 	}
 
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
-		unset( $notoptions[ $option ] );
-		wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set($notoptions_key, $notoptions, 'site-options');
 	}
 
-	if ( ! is_multisite() ) {
-		$result = update_option( $option, $value, 'no' );
+	if ( ! is_multisite()) {
+		$result = update_option($option, $value, 'no');
 	} else {
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->update($wpdb->sitemeta, array('meta_value' => $serialized_value), array('site_id' => $network_id, 'meta_key' => $option));
 
-		if ( $result ) {
+		if ($result) {
 			$cache_key = "$network_id:$option";
-			wp_cache_set( $cache_key, $value, 'site-options' );
+			wp_cache_set($cache_key, $value, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value of a specific network option has been successfully updated.
@@ -1462,7 +1462,7 @@ 
 		 * @param mixed  $value     Current value of the network option.
 		 * @param mixed  $old_value Old value of the network option.
 		 */
-		do_action( 'update_site_option_' . $option, $option, $value, $old_value );
+		do_action('update_site_option_'.$option, $option, $value, $old_value);
 
 		/**
 		 * Fires after the value of a network option has been successfully updated.
@@ -1473,7 +1473,7 @@ 
 		 * @param mixed  $value     Current value of the network option.
 		 * @param mixed  $old_value Old value of the network option.
 		 */
-		do_action( 'update_site_option', $option, $value, $old_value );
+		do_action('update_site_option', $option, $value, $old_value);
 
 		return true;
 	}
@@ -1489,7 +1489,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool True if successful, false otherwise
  */
-function delete_site_transient( $transient ) {
+function delete_site_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific site transient is deleted.
@@ -1500,18 +1500,18 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_site_transient_' . $transient, $transient );
+	do_action('delete_site_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'site-transient');
 	} else {
-		$option_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		$option_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		$result = delete_site_option($option);
+		if ($result)
+			delete_site_option($option_timeout);
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -1520,7 +1520,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_site_transient', $transient );
+		do_action('deleted_site_transient', $transient);
 	}
 
 	return $result;
@@ -1539,7 +1539,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_site_transient( $transient ) {
+function get_site_transient($transient) {
 
 	/**
 	 * Filters the value of an existing site transient.
@@ -1557,29 +1557,29 @@ 
 	 *                                   of the transient, and return the returned value.
 	 * @param string $transient          Transient name.
 	 */
-	$pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient );
+	$pre = apply_filters('pre_site_transient_'.$transient, false, $transient);
 
-	if ( false !== $pre )
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'site-transient');
 	} else {
 		// Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
 		$no_timeout = array('update_core', 'update_plugins', 'update_themes');
-		$transient_option = '_site_transient_' . $transient;
-		if ( ! in_array( $transient, $no_timeout ) ) {
-			$transient_timeout = '_site_transient_timeout_' . $transient;
-			$timeout = get_site_option( $transient_timeout );
-			if ( false !== $timeout && $timeout < time() ) {
-				delete_site_option( $transient_option  );
-				delete_site_option( $transient_timeout );
+		$transient_option = '_site_transient_'.$transient;
+		if ( ! in_array($transient, $no_timeout)) {
+			$transient_timeout = '_site_transient_timeout_'.$transient;
+			$timeout = get_site_option($transient_timeout);
+			if (false !== $timeout && $timeout < time()) {
+				delete_site_option($transient_option);
+				delete_site_option($transient_timeout);
 				$value = false;
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_site_option($transient_option);
 	}
 
 	/**
@@ -1593,7 +1593,7 @@ 
 	 * @param mixed  $value     Value of site transient.
 	 * @param string $transient Transient name.
 	 */
-	return apply_filters( 'site_transient_' . $transient, $value, $transient );
+	return apply_filters('site_transient_'.$transient, $value, $transient);
 }
 
 /**
@@ -1612,7 +1612,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0 (no expiration).
  * @return bool False if value was not set and true if value was set.
  */
-function set_site_transient( $transient, $value, $expiration = 0 ) {
+function set_site_transient($transient, $value, $expiration = 0) {
 
 	/**
 	 * Filters the value of a specific site transient before it is set.
@@ -1625,7 +1625,7 @@ 
 	 * @param mixed  $value     New value of site transient.
 	 * @param string $transient Transient name.
 	 */
-	$value = apply_filters( 'pre_set_site_transient_' . $transient, $value, $transient );
+	$value = apply_filters('pre_set_site_transient_'.$transient, $value, $transient);
 
 	$expiration = (int) $expiration;
 
@@ -1640,24 +1640,24 @@ 
 	 * @param mixed  $value      New value of site transient.
 	 * @param string $transient  Transient name.
 	 */
-	$expiration = apply_filters( 'expiration_of_site_transient_' . $transient, $expiration, $value, $transient );
+	$expiration = apply_filters('expiration_of_site_transient_'.$transient, $expiration, $value, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'site-transient', $expiration);
 	} else {
-		$transient_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
-			$result = add_site_option( $option, $value );
+		$transient_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		if (false === get_site_option($option)) {
+			if ($expiration)
+				add_site_option($transient_timeout, time() + $expiration);
+			$result = add_site_option($option, $value);
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
-			$result = update_site_option( $option, $value );
+			if ($expiration)
+				update_site_option($transient_timeout, time() + $expiration);
+			$result = update_site_option($option, $value);
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific site transient has been set.
@@ -1671,7 +1671,7 @@ 
 		 * @param int    $expiration Time until expiration in seconds.
 		 * @param string $transient  Transient name.
 		 */
-		do_action( 'set_site_transient_' . $transient, $value, $expiration, $transient );
+		do_action('set_site_transient_'.$transient, $value, $expiration, $transient);
 
 		/**
 		 * Fires after the value for a site transient has been set.
@@ -1682,7 +1682,7 @@ 
 		 * @param mixed  $value      Site transient value.
 		 * @param int    $expiration Time until expiration in seconds.
 		 */
-		do_action( 'setted_site_transient', $transient, $value, $expiration );
+		do_action('setted_site_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }

Braces +96 added lines, -65 removed lines

@@ -31,8 +31,9 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	/**
 	 * Filters the value of an existing option before it is retrieved.
@@ -50,11 +51,13 @@ 
 	 * @param string     $option     Option name.
 	 */
 	$pre = apply_filters( 'pre_option_' . $option, false, $option );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
-		return false;
+	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+			return false;
+	}
 
 	if ( ! wp_installing() ) {
 		// prevent non-existent options from triggering multiple queries
@@ -114,11 +117,13 @@ 
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ( 'home' == $option && '' == $value ) {
+			return get_option( 'siteurl' );
+	}
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) ) {
+			$value = untrailingslashit( $value );
+	}
 
 	/**
 	 * Filters the value of an existing option.
@@ -147,9 +152,10 @@ 
  * @param string $option Option name.
  */
 function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
-}
+	if ( 'alloptions' === $option || 'notoptions' === $option ) {
+			wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+	}
+	}
 
 /**
  * Print option value after sanitizing for forms.
@@ -174,22 +180,25 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( ! wp_installing() || ! is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
-	else
-		$alloptions = false;
+	if ( ! wp_installing() || ! is_multisite() ) {
+			$alloptions = wp_cache_get( 'alloptions', 'options' );
+	} else {
+			$alloptions = false;
+	}
 
 	if ( !$alloptions ) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) ) {
+					$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		}
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
 		foreach ( (array) $alloptions_db as $o ) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( ! wp_installing() || ! is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( ! wp_installing() || ! is_multisite() ) {
+					wp_cache_add( 'alloptions', $alloptions, 'options' );
+		}
 	}
 
 	return $alloptions;
@@ -207,11 +216,13 @@ 
 function wp_load_core_site_options( $site_id = null ) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
-		return;
+	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) {
+			return;
+	}
 
-	if ( empty($site_id) )
-		$site_id = $wpdb->siteid;
+	if ( empty($site_id) ) {
+			$site_id = $wpdb->siteid;
+	}
 
 	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 
@@ -254,13 +265,15 @@ 
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object( $value ) )
-		$value = clone $value;
+	if ( is_object( $value ) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 	$old_value = get_option( $option );
@@ -291,8 +304,9 @@ 
 	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
-		return false;
+	if ( $value === $old_value ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/option.php */
 	if ( apply_filters( 'default_option_' . $option, false, $option ) === $old_value ) {
@@ -326,8 +340,9 @@ 
 	}
 
 	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
@@ -398,26 +413,30 @@ 
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.3.0' );
+	}
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object($value) )
-		$value = clone $value;
+	if ( is_object($value) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
-		/** This filter is documented in wp-includes/option.php */
+	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) ) {
+			/** This filter is documented in wp-includes/option.php */
 		if ( apply_filters( 'default_option_' . $option, false, $option ) !== get_option( $option ) )
 			return false;
+	}
 
 	$serialized_value = maybe_serialize( $value );
 	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
@@ -433,8 +452,9 @@ 
 	do_action( 'add_option', $option, $value );
 
 	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	if ( ! wp_installing() ) {
 		if ( 'yes' == $autoload ) {
@@ -492,15 +512,17 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
 	// Get the ID, if no ID then return
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
-		return false;
+	if ( is_null( $row ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before an option is deleted.
@@ -576,8 +598,9 @@ 
 		$option_timeout = '_transient_timeout_' . $transient;
 		$option = '_transient_' . $transient;
 		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		if ( $result ) {
+					delete_option( $option_timeout );
+		}
 	}
 
 	if ( $result ) {
@@ -625,8 +648,9 @@ 
 	 * @param string $transient     Transient name.
 	 */
 	$pre = apply_filters( 'pre_transient_' . $transient, false, $transient );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'transient' );
@@ -646,8 +670,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_option( $transient_option );
+		}
 	}
 
 	/**
@@ -804,8 +829,9 @@ 
 		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
 
 		// No change or both empty
-		if ( $cookie == $settings )
-			return;
+		if ( $cookie == $settings ) {
+					return;
+		}
 
 		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
 		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
@@ -1508,8 +1534,9 @@ 
 		$option_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		if ( $result ) {
+					delete_site_option( $option_timeout );
+		}
 	}
 	if ( $result ) {
 
@@ -1559,8 +1586,9 @@ 
 	 */
 	$pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient );
 
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'site-transient' );
@@ -1578,8 +1606,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_site_option( $transient_option );
+		}
 	}
 
 	/**
@@ -1648,12 +1677,14 @@ 
 		$transient_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							add_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = add_site_option( $option, $value );
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							update_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = update_site_option( $option, $value );
 		}
 	}