ntwb / wordpress

tools/i18n/t/data/add-textdomain-0.php

Spacing +15 added lines, -15 removed lines

@@ -1,18 +1,18 @@
 <?php
 function call_some_i18n_methods() {
-	__( 'Hello World' );
-	_e( 'Hello World' );
-	_n( 'Single', 'Plural', 1 );
-	_n_noop( 'Single Noop', 'Plural Noop', 1 );
-	_x( 'Hello World', 'Testing' );
-	_ex( 'Hello World', 'Testing' );
-	_nx( 'Hello World', 'Testing' );
-	_nx_noop( 'Hello World Noop', 'Testing' );
-	esc_attr__( 'Attribute' );
-	esc_html__( 'HTML' );
-	esc_attr_e( 'Attribute' );
-	esc_html_e( 'HTML' );
-	esc_attr_x( 'Attribute', 'Testing' );
-	esc_html_x( 'HTML', 'Testing' );
-	translate_nooped_plural( 'Plural Noop', 2 );
+	__('Hello World');
+	_e('Hello World');
+	_n('Single', 'Plural', 1);
+	_n_noop('Single Noop', 'Plural Noop', 1);
+	_x('Hello World', 'Testing');
+	_ex('Hello World', 'Testing');
+	_nx('Hello World', 'Testing');
+	_nx_noop('Hello World Noop', 'Testing');
+	esc_attr__('Attribute');
+	esc_html__('HTML');
+	esc_attr_e('Attribute');
+	esc_html_e('HTML');
+	esc_attr_x('Attribute', 'Testing');
+	esc_html_x('HTML', 'Testing');
+	translate_nooped_plural('Plural Noop', 2);
 }

src/wp-content/themes/twentyeleven/sidebar-page.php

Spacing +3 added lines, -3 removed lines

@@ -17,11 +17,11 @@
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
-					<?php get_template_part( 'content', 'page' ); ?>
+					<?php get_template_part('content', 'page'); ?>
 
-					<?php comments_template( '', true ); ?>
+					<?php comments_template('', true); ?>
 
 				<?php endwhile; // end of the loop. ?>
 

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

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * The template for displaying the footer
- *
- * Contains footer content and the closing of the #main and #page div elements.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
+		 * The template for displaying the footer
+		 *
+		 * Contains footer content and the closing of the #main and #page div elements.
+		 *
+		 * @package WordPress
+		 * @subpackage Twenty_Thirteen
+		 * @since Twenty Thirteen 1.0
+		 */
 ?>
 
 		</div><!-- #main -->

Spacing +3 added lines, -3 removed lines

@@ -12,11 +12,11 @@
 
 		</div><!-- #main -->
 		<footer id="colophon" class="site-footer" role="contentinfo">
-			<?php get_sidebar( 'main' ); ?>
+			<?php get_sidebar('main'); ?>
 
 			<div class="site-info">
-				<?php do_action( 'twentythirteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
+				<?php do_action('twentythirteen_credits'); ?>
+				<a href="<?php echo esc_url(__('https://wordpress.org/', 'twentythirteen')); ?>"><?php printf(__('Proudly powered by %s', 'twentythirteen'), 'WordPress'); ?></a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->

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

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<?php if ( is_single() ) : ?>
+		<?php if (is_single()) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
 		<h1 class="entry-title">
@@ -22,27 +22,27 @@ 
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
 		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
 		<?php twentythirteen_entry_meta(); ?>
 
-		<?php if ( comments_open() && ! is_single() ) : ?>
+		<?php if (comments_open() && ! is_single()) : ?>
 		<span class="comments-link">
-			<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a comment', 'twentythirteen' ) . '</span>', __( 'One comment so far', 'twentythirteen' ), __( 'View all % comments', 'twentythirteen' ) ); ?>
+			<?php comments_popup_link('<span class="leave-reply">'.__('Leave a comment', 'twentythirteen').'</span>', __('One comment so far', 'twentythirteen'), __('View all % comments', 'twentythirteen')); ?>
 		</span><!-- .comments-link -->
 		<?php endif; // comments_open() ?>
-		<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
 
-		<?php if ( is_single() && get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
-			<?php get_template_part( 'author-bio' ); ?>
+		<?php if (is_single() && get_the_author_meta('description') && is_multi_author()) : ?>
+			<?php get_template_part('author-bio'); ?>
 		<?php endif; ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->

Braces +5 added lines, -2 removed lines

@@ -12,9 +12,12 @@
 	<header class="entry-header">
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<h1 class="entry-title">
-			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+			<a href="<?php the_permalink();
+}
+?>" rel="bookmark"><?php the_title(); ?></a>
 		</h1>
 		<?php endif; // is_single() ?>
 	</header><!-- .entry-header -->

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

Spacing +84 added lines, -84 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', get_template_directory() . '/languages' );
+	load_theme_textdomain('twentyfifteen', get_template_directory().'/languages');
 
 	// 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,64 +70,64 @@ 
 	 * 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_image_size( 'twentyfifteen-logo', 248, 248 );
-	add_theme_support( 'custom-logo', array( 'size' => 'twentyfifteen-logo' ) );
+	add_image_size('twentyfifteen-logo', 248, 248);
+	add_theme_support('custom-logo', array('size' => 'twentyfifteen-logo'));
 
 	$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()));
 }
 endif; // twentyfifteen_setup
-add_action( 'after_setup_theme', 'twentyfifteen_setup' );
+add_action('after_setup_theme', 'twentyfifteen_setup');
 
 /**
  * Register widget area.
@@ -137,19 +137,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.
  *
@@ -166,7 +166,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';
 	}
 
@@ -174,7 +174,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';
 	}
 
@@ -182,7 +182,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';
 	}
 
@@ -190,23 +190,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;
@@ -223,7 +223,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.
@@ -232,39 +232,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.
@@ -274,39 +274,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.
@@ -319,14 +319,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.
@@ -336,28 +336,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/twentytwelve/page-templates/full-width.php

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * Template Name: Full-width Page Template, No Sidebar
- *
- * Description: Twenty Twelve loves the no-sidebar look as much as
- * you do. Use this page template to remove the sidebar from any page.
- *
- * Tip: to remove the sidebar from all posts and pages simply remove
- * any active widgets from the Main Sidebar area, and the sidebar will
- * disappear everywhere.
- *
- * @package WordPress
- * @subpackage Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
+		 * Template Name: Full-width Page Template, No Sidebar
+		 *
+		 * Description: Twenty Twelve loves the no-sidebar look as much as
+		 * you do. Use this page template to remove the sidebar from any page.
+		 *
+		 * Tip: to remove the sidebar from all posts and pages simply remove
+		 * any active widgets from the Main Sidebar area, and the sidebar will
+		 * disappear everywhere.
+		 *
+		 * @package WordPress
+		 * @subpackage Twenty_Twelve
+		 * @since Twenty Twelve 1.0
+		 */
 
 get_header(); ?>
 

Spacing +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', 'page' ); ?>
-				<?php comments_template( '', true ); ?>
+			<?php while (have_posts()) : the_post(); ?>
+				<?php get_template_part('content', 'page'); ?>
+				<?php comments_template('', true); ?>
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->

src/wp-load.php

Spacing +26 added lines, -26 removed lines

@@ -19,9 +19,9 @@ 
  */
 
 /** Define ABSPATH as this file's directory */
-define( 'ABSPATH', dirname(__FILE__) . '/' );
+define('ABSPATH', dirname(__FILE__).'/');
 
-error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 
 /*
  * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php
@@ -31,63 +31,63 @@ 
  *
  * If neither set of conditions is true, initiate loading the setup process.
  */
-if ( file_exists( ABSPATH . 'wp-config.php') ) {
+if (file_exists(ABSPATH.'wp-config.php')) {
 
 	/** The config file resides in ABSPATH */
-	require_once( ABSPATH . 'wp-config.php' );
+	require_once(ABSPATH.'wp-config.php');
 
-} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
+} elseif (@file_exists(dirname(ABSPATH).'/wp-config.php') && ! @file_exists(dirname(ABSPATH).'/wp-settings.php')) {
 
 	/** The config file resides one level above ABSPATH but is not part of another install */
-	require_once( dirname( ABSPATH ) . '/wp-config.php' );
+	require_once(dirname(ABSPATH).'/wp-config.php');
 
 } else {
 
 	// A config file doesn't exist
 
-	define( 'WPINC', 'wp-includes' );
-	require_once( ABSPATH . WPINC . '/load.php' );
+	define('WPINC', 'wp-includes');
+	require_once(ABSPATH.WPINC.'/load.php');
 
 	// Standardize $_SERVER variables across setups.
 	wp_fix_server_vars();
 
-	require_once( ABSPATH . WPINC . '/functions.php' );
+	require_once(ABSPATH.WPINC.'/functions.php');
 
-	$path = wp_guess_url() . '/wp-admin/setup-config.php';
+	$path = wp_guess_url().'/wp-admin/setup-config.php';
 
 	/*
 	 * We're going to redirect to setup-config.php. While this shouldn't result
 	 * in an infinite loop, that's a silly thing to assume, don't you think? If
 	 * we're traveling in circles, our last-ditch effort is "Need more help?"
 	 */
-	if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
-		header( 'Location: ' . $path );
+	if (false === strpos($_SERVER['REQUEST_URI'], 'setup-config')) {
+		header('Location: '.$path);
 		exit;
 	}
 
-	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
-	require_once( ABSPATH . WPINC . '/version.php' );
+	define('WP_CONTENT_DIR', ABSPATH.'wp-content');
+	require_once(ABSPATH.WPINC.'/version.php');
 
 	wp_check_php_mysql_versions();
 	wp_load_translations_early();
 
 	// Die with an error message
-	$die  = sprintf(
+	$die = sprintf(
 		/* translators: %s: wp-config.php */
-		__( "There doesn't seem to be a %s file. I need this before we can get started." ),
+		__("There doesn't seem to be a %s file. I need this before we can get started."),
 		'<code>wp-config.php</code>'
-	) . '</p>';
-	$die .= '<p>' . sprintf(
+	).'</p>';
+	$die .= '<p>'.sprintf(
 		/* translators: %s: Codex URL */
-		__( "Need more help? <a href='%s'>We got it</a>." ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
-	) . '</p>';
-	$die .= '<p>' . sprintf(
+		__("Need more help? <a href='%s'>We got it</a>."),
+		__('https://codex.wordpress.org/Editing_wp-config.php')
+	).'</p>';
+	$die .= '<p>'.sprintf(
 		/* translators: %s: wp-config.php */
-		__( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ),
+		__("You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file."),
 		'<code>wp-config.php</code>'
-	) . '</p>';
-	$die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
+	).'</p>';
+	$die .= '<p><a href="'.$path.'" class="button button-large">'.__("Create a Configuration File").'</a>';
 
-	wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
+	wp_die($die, __('WordPress &rsaquo; Error'));
 }

src/wp-admin/upload.php

Spacing +143 added lines, -143 removed lines

@@ -7,90 +7,90 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('upload_files') )
-	wp_die( __( 'You do not have permission to upload files.' ) );
+if ( ! current_user_can('upload_files'))
+	wp_die(__('You do not have permission to upload files.'));
 
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
-$modes = array( 'grid', 'list' );
+$mode = get_user_option('media_library_mode', get_current_user_id()) ? get_user_option('media_library_mode', get_current_user_id()) : 'grid';
+$modes = array('grid', 'list');
 
-if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
+if (isset($_GET['mode']) && in_array($_GET['mode'], $modes)) {
 	$mode = $_GET['mode'];
-	update_user_option( get_current_user_id(), 'media_library_mode', $mode );
+	update_user_option(get_current_user_id(), 'media_library_mode', $mode);
 }
 
-if ( 'grid' === $mode ) {
+if ('grid' === $mode) {
 	wp_enqueue_media();
-	wp_enqueue_script( 'media-grid' );
-	wp_enqueue_script( 'media' );
+	wp_enqueue_script('media-grid');
+	wp_enqueue_script('media');
 
-	remove_action( 'admin_head', 'wp_admin_canonical_url' );
+	remove_action('admin_head', 'wp_admin_canonical_url');
 
 	$q = $_GET;
 	// let JS handle this
-	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
-	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
-	foreach ( $vars as $key => $value ) {
-		if ( ! $value || in_array( $key, $ignore ) ) {
-			unset( $vars[ $key ] );
+	unset($q['s']);
+	$vars = wp_edit_attachments_query_vars($q);
+	$ignore = array('mode', 'post_type', 'post_status', 'posts_per_page');
+	foreach ($vars as $key => $value) {
+		if ( ! $value || in_array($key, $ignore)) {
+			unset($vars[$key]);
 		}
 	}
 
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
+	wp_localize_script('media-grid', '_wpMediaGridSettings', array(
+		'adminUrl' => parse_url(self_admin_url(), PHP_URL_PATH),
 		'queryVars' => (object) $vars
-	) );
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'overview',
-		'title'		=> __( 'Overview' ),
+		'title'		=> __('Overview'),
 		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
-	) );
+			'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.').'</p>'.
+			'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'.
+			'<p>'.__('To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.').'</p>'
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'attachment-details',
-		'title'		=> __( 'Attachment Details' ),
+		'title'		=> __('Attachment Details'),
 		'content'	=>
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
-	) );
+			'<p>'.__('Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.').'</p>'.
+			'<p>'.__('Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.').'</p>'.
+			'<p>'.__('You can also delete individual items and access the extended edit screen from the details dialog.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</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/Media_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	$title = __('Media Library');
 	$parent_file = 'upload.php';
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
 		<h1>
 		<?php
-		echo esc_html( $title );
-		if ( current_user_can( 'upload_files' ) ) { ?>
-			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+		echo esc_html($title);
+		if (current_user_can('upload_files')) { ?>
+			<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 		}
 		?>
 		</h1>
 		<div class="error hide-if-js">
 			<p><?php printf(
 				/* translators: %s: list view URL */
-				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
+				__('The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.'),
 				'upload.php?mode=list'
 			); ?></p>
 		</div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -100,75 +100,75 @@ 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-media');
 
-	if ( 'delete_all' == $doaction ) {
-		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
+	if ('delete_all' == $doaction) {
+		$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'");
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
 	}
 
 	$location = 'upload.php';
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'upload.php'))
+			$location = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer);
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'detach':
-			wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+			wp_media_attach_action($_REQUEST['parent_post_id'], 'detach');
 			break;
 
 		case 'attach':
-			wp_media_attach_action( $_REQUEST['found_post_id'] );
+			wp_media_attach_action($_REQUEST['found_post_id']);
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item to the Trash.'));
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 			}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			$location = add_query_arg(array('trashed' => count($post_ids), 'ids' => join(',', $post_ids)), $location);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item out of the Trash.'));
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 			}
-			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
+			$location = add_query_arg('untrashed', count($post_ids), $location);
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this item.' ) );
+			foreach ((array) $post_ids as $post_id_del) {
+				if ( ! current_user_can('delete_post', $post_id_del))
+					wp_die(__('You are not allowed to delete this item.'));
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( ! wp_delete_attachment($post_id_del))
+					wp_die(__('Error in deleting.'));
 			}
-			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
+			$location = add_query_arg('deleted', count($post_ids), $location);
 			break;
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -177,135 +177,135 @@ 
 $title = __('Media Library');
 $parent_file = 'upload.php';
 
-wp_enqueue_script( 'media' );
+wp_enqueue_script('media');
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.').'</p>'.
+	'<p>'.__('You can narrow the list by file type/status or by date using the dropdown menus above the media table.').'</p>'.
+	'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'actions-links',
 'title'		=> __('Available Actions'),
 'content'	=>
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'attaching-files',
 'title'		=> __('Attaching Files'),
 'content'	=>
-	'<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
-) );
+	'<p>'.__('If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</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/Media_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter media items list' ),
-	'heading_pagination' => __( 'Media items list navigation' ),
-	'heading_list'       => __( 'Media items list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter media items list'),
+	'heading_pagination' => __('Media items list navigation'),
+	'heading_list'       => __('Media items list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) ) { ?>
-	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
+echo esc_html($title);
+if (current_user_can('upload_files')) { ?>
+	<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 }
 ?>
 </h1>
 
 <?php
 $message = '';
-if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media file updated.' );
+if ( ! empty($_GET['posted'])) {
+	$message = __('Media file updated.');
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
-	if ( 1 == $attached ) {
-		$message = __( 'Media file attached.' );
+if ( ! empty($_GET['attached']) && $attached = absint($_GET['attached'])) {
+	if (1 == $attached) {
+		$message = __('Media file attached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
+		$message = _n('%s media file attached.', '%s media files attached.', $attached);
 	}
-	$message = sprintf( $message, number_format_i18n( $attached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($attached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
-	if ( 1 == $detached ) {
-		$message = __( 'Media file detached.' );
+if ( ! empty($_GET['detach']) && $detached = absint($_GET['detach'])) {
+	if (1 == $detached) {
+		$message = __('Media file detached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
+		$message = _n('%s media file detached.', '%s media files detached.', $detached);
 	}
-	$message = sprintf( $message, number_format_i18n( $detached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($detached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
-	if ( 1 == $deleted ) {
-		$message = __( 'Media file permanently deleted.' );
+if ( ! empty($_GET['deleted']) && $deleted = absint($_GET['deleted'])) {
+	if (1 == $deleted) {
+		$message = __('Media file permanently deleted.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
+		$message = _n('%s media file permanently deleted.', '%s media files permanently deleted.', $deleted);
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
+	$message = sprintf($message, number_format_i18n($deleted));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
-	if ( 1 == $trashed ) {
-		$message = __( 'Media file moved to the trash.' );
+if ( ! empty($_GET['trashed']) && $trashed = absint($_GET['trashed'])) {
+	if (1 == $trashed) {
+		$message = __('Media file moved to the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
+		$message = _n('%s media file moved to the trash.', '%s media files moved to the trash.', $trashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
+	$message = sprintf($message, number_format_i18n($trashed));
+	$message .= ' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
-	if ( 1 == $untrashed ) {
-		$message = __( 'Media file restored from the trash.' );
+if ( ! empty($_GET['untrashed']) && $untrashed = absint($_GET['untrashed'])) {
+	if (1 == $untrashed) {
+		$message = __('Media file restored from the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
+		$message = _n('%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
+	$message = sprintf($message, number_format_i18n($untrashed));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
 }
 
-$messages[1] = __( 'Media file updated.' );
-$messages[2] = __( 'Media file permanently deleted.' );
-$messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media file restored from the trash.' );
+$messages[1] = __('Media file updated.');
+$messages[2] = __('Media file permanently deleted.');
+$messages[3] = __('Error saving media file.');
+$messages[4] = __('Media file moved to the trash.').' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
+$messages[5] = __('Media file restored from the trash.');
 
-if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
+if ( ! empty($_GET['message']) && isset($messages[$_GET['message']])) {
+	$message = $messages[$_GET['message']];
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 
-if ( !empty($message) ) { ?>
+if ( ! empty($message)) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 
@@ -321,4 +321,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +32 added lines, -21 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( !current_user_can('upload_files') ) {
 	wp_die( __( 'You do not have permission to upload files.' ) );
+}
 
 $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
@@ -114,8 +115,9 @@ 
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
+					$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -128,38 +130,47 @@ 
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				}
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( !wp_trash_post( $post_id ) ) {
+									wp_die( __( 'Error in moving to Trash.' ) );
+				}
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( !wp_untrash_post( $post_id ) ) {
+									wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this item.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'You are not allowed to delete this item.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( !wp_delete_attachment( $post_id_del ) ) {
+									wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;

src/wp-admin/widgets.php

Indentation +4 added lines, -4 removed lines

@@ -372,10 +372,10 @@
 
 <?php
 /**
- * Fires before the Widgets administration page content loads.
- *
- * @since 3.0.0
- */
+	 * Fires before the Widgets administration page content loads.
+	 *
+	 * @since 3.0.0
+	 */
 do_action( 'widgets_admin_page' ); ?>
 
 <div class="widget-liquid-left">

Spacing +152 added lines, -152 removed lines

@@ -7,32 +7,32 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Administration Widgets API */
-require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+require_once(ABSPATH.'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-$widgets_access = get_user_setting( 'widgets_access' );
-if ( isset($_GET['widgets-access']) ) {
+$widgets_access = get_user_setting('widgets_access');
+if (isset($_GET['widgets-access'])) {
 	$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
-	set_user_setting( 'widgets_access', $widgets_access );
+	set_user_setting('widgets_access', $widgets_access);
 }
 
-if ( 'on' == $widgets_access ) {
-	add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+if ('on' == $widgets_access) {
+	add_filter('admin_body_class', 'wp_widgets_access_body_class');
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
+	if (wp_is_mobile())
+		wp_enqueue_script('jquery-touch-punch');
 }
 
 /**
@@ -41,68 +41,68 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_setup' );
+do_action('sidebar_admin_setup');
 
-$title = __( 'Widgets' );
+$title = __('Widgets');
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.').'</p>
+	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'removing-reusing',
 'title'		=> __('Removing and Reusing'),
 'content'	=>
-	'<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.').'</p>
+	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.').'</p>
+	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'missing-widgets',
 'title'		=> __('Missing Widgets'),
 'content'	=>
-	'<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
-		'<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
-) );
+	'<p>'.__('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.').'</p>'.
+		'<p>'.__('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</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/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ) );
+if ( ! current_theme_supports('widgets')) {
+	wp_die(__('The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.'));
 }
 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if (empty($sidebars_widgets))
 	$sidebars_widgets = wp_get_widget_defaults();
 
-foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
+foreach ($sidebars_widgets as $sidebar_id => $widgets) {
+	if ('wp_inactive_widgets' == $sidebar_id)
 		continue;
 
-	if ( ! is_registered_sidebar( $sidebar_id ) ) {
-		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
+	if ( ! is_registered_sidebar($sidebar_id)) {
+		if ( ! empty($widgets)) { // register the inactive_widgets area as sidebar
 			register_sidebar(array(
-				'name' => __( 'Inactive Sidebar (not used)' ),
+				'name' => __('Inactive Sidebar (not used)'),
 				'id' => $sidebar_id,
 				'class' => 'inactive-sidebar orphan-sidebar',
-				'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+				'description' => __('This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.'),
 				'before_widget' => '',
 				'after_widget' => '',
 				'before_title' => '',
 				'after_title' => '',
 			));
 		} else {
-			unset( $sidebars_widgets[ $sidebar_id ] );
+			unset($sidebars_widgets[$sidebar_id]);
 		}
 	}
 }
@@ -112,7 +112,7 @@ 
 	'name' => __('Inactive Widgets'),
 	'id' => 'wp_inactive_widgets',
 	'class' => 'inactive-sidebar',
-	'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+	'description' => __('Drag widgets here to remove them from the sidebar but keep their settings.'),
 	'before_widget' => '',
 	'after_widget' => '',
 	'before_title' => '',
@@ -122,36 +122,36 @@ 
 retrieve_widgets();
 
 // We're saving a widget without js
-if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+if (isset($_POST['savewidget']) || isset($_POST['removewidget'])) {
 	$widget_id = $_POST['widget-id'];
 	check_admin_referer("save-delete-widget-$widget_id");
 
 	$number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
-	if ( $number ) {
-		foreach ( $_POST as $key => $val ) {
-			if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
-				$_POST[$key] = array( $number => array_shift($val) );
+	if ($number) {
+		foreach ($_POST as $key => $val) {
+			if (is_array($val) && preg_match('/__i__|%i%/', key($val))) {
+				$_POST[$key] = array($number => array_shift($val));
 				break;
 			}
 		}
 	}
 
 	$sidebar_id = $_POST['sidebar'];
-	$position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
+	$position = isset($_POST[$sidebar_id.'_position']) ? (int) $_POST[$sidebar_id.'_position'] - 1 : 0;
 
 	$id_base = $_POST['id_base'];
 	$sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
 	// Delete.
-	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
+	if (isset($_POST['removewidget']) && $_POST['removewidget']) {
 
-		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+		if ( ! in_array($widget_id, $sidebar, true)) {
+			wp_redirect(admin_url('widgets.php?error=0'));
 			exit;
 		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff($sidebar, array($widget_id));
+		$_POST = array('sidebar' => $sidebar_id, 'widget-'.$id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
 
 		/**
 		 * Fires immediately after a widget has been marked for deletion.
@@ -162,17 +162,17 @@ 
 		 * @param string $sidebar_id ID of the sidebar the widget was deleted from.
 		 * @param string $id_base    ID base for the widget.
 		 */
-		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
+		do_action('delete_widget', $widget_id, $sidebar_id, $id_base);
 	}
 
 	$_POST['widget-id'] = $sidebar;
 
-	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
+	foreach ((array) $wp_registered_widget_updates as $name => $control) {
+		if ($name != $id_base || ! is_callable($control['callback']))
 			continue;
 
 		ob_start();
-			call_user_func_array( $control['callback'], $control['params'] );
+			call_user_func_array($control['callback'], $control['params']);
 		ob_end_clean();
 
 		break;
@@ -181,58 +181,58 @@ 
 	$sidebars_widgets[$sidebar_id] = $sidebar;
 
 	// Remove old position.
-	if ( !isset($_POST['delete_widget']) ) {
-		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+	if ( ! isset($_POST['delete_widget'])) {
+		foreach ($sidebars_widgets as $key => $sb) {
+			if (is_array($sb))
+				$sidebars_widgets[$key] = array_diff($sb, array($widget_id));
 		}
-		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+		array_splice($sidebars_widgets[$sidebar_id], $position, 0, $widget_id);
 	}
 
 	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Remove inactive widgets without js
-if ( isset( $_POST['removeinactivewidgets'] ) ) {
-	check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
-
-	if ( $_POST['removeinactivewidgets'] ) {
-		foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-			$pieces = explode( '-', $widget_id );
-			$multi_number = array_pop( $pieces );
-			$id_base = implode( '-', $pieces );
-			$widget = get_option( 'widget_' . $id_base );
-			unset( $widget[$multi_number] );
-			update_option( 'widget_' . $id_base, $widget );
-			unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+if (isset($_POST['removeinactivewidgets'])) {
+	check_admin_referer('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets');
+
+	if ($_POST['removeinactivewidgets']) {
+		foreach ($sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id) {
+			$pieces = explode('-', $widget_id);
+			$multi_number = array_pop($pieces);
+			$id_base = implode('-', $pieces);
+			$widget = get_option('widget_'.$id_base);
+			unset($widget[$multi_number]);
+			update_option('widget_'.$id_base, $widget);
+			unset($sidebars_widgets['wp_inactive_widgets'][$key]);
 		}
 
-		wp_set_sidebars_widgets( $sidebars_widgets );
+		wp_set_sidebars_widgets($sidebars_widgets);
 	}
 
-	wp_redirect( admin_url( 'widgets.php?message=0' ) );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Output the widget form without js
-if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+if (isset($_GET['editwidget']) && $_GET['editwidget']) {
 	$widget_id = $_GET['editwidget'];
 
-	if ( isset($_GET['addnew']) ) {
+	if (isset($_GET['addnew'])) {
 		// Default to the first sidebar
-		$keys = array_keys( $wp_registered_sidebars );
-		$sidebar = reset( $keys );
+		$keys = array_keys($wp_registered_sidebars);
+		$sidebar = reset($keys);
 
-		if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+		if (isset($_GET['base']) && isset($_GET['num'])) { // multi-widget
 			// Copy minimal info from an existing instance of this widget to a new instance
-			foreach ( $wp_registered_widget_controls as $control ) {
-				if ( $_GET['base'] === $control['id_base'] ) {
+			foreach ($wp_registered_widget_controls as $control) {
+				if ($_GET['base'] === $control['id_base']) {
 					$control_callback = $control['callback'];
 					$multi_number = (int) $_GET['num'];
 					$control['params'][0]['number'] = -1;
-					$widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
+					$widget_id = $control['id'] = $control['id_base'].'-'.$multi_number;
 					$wp_registered_widget_controls[$control['id']] = $control;
 					break;
 				}
@@ -240,66 +240,66 @@ 
 		}
 	}
 
-	if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
+	if (isset($wp_registered_widget_controls[$widget_id]) && ! isset($control)) {
 		$control = $wp_registered_widget_controls[$widget_id];
 		$control_callback = $control['callback'];
-	} elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
-		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+	} elseif ( ! isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id])) {
+		$name = esc_html(strip_tags($wp_registered_widgets[$widget_id]['name']));
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( ! isset($name))
+		$name = esc_html(strip_tags($control['name']));
 
-	if ( !isset($sidebar) )
+	if ( ! isset($sidebar))
 		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-	if ( !isset($multi_number) )
+	if ( ! isset($multi_number))
 		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
 	// Show the widget form.
-	$width = ' style="width:' . max($control['width'], 350) . 'px"';
+	$width = ' style="width:'.max($control['width'], 350).'px"';
 	$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+	require_once(ABSPATH.'wp-admin/admin-header.php'); ?>
 	<div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
-	<h2><?php printf( __( 'Widget %s' ), $name ); ?></h2>
+	<h2><?php printf(__('Widget %s'), $name); ?></h2>
 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
+	if (is_callable($control_callback))
+		call_user_func_array($control_callback, $control['params']);
 	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo '<p>'.__('There are no options for this widget.')."</p>\n"; ?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
 	<div class="widget-position">
 	<table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
 <?php
-	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+	foreach ($wp_registered_sidebars as $sbname => $sbvalue) {
+		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='".esc_attr($sbname)."'".checked($sbname, $sidebar, false)." /> $sbvalue[name]</label></td><td>";
+		if ('wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr($sbname, 0, 16)) {
 			echo '&nbsp;';
 		} else {
-			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
+			if ( ! isset($sidebars_widgets[$sbname]) || ! is_array($sidebars_widgets[$sbname])) {
 				$j = 1;
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
+				if (isset($_GET['addnew']) || ! in_array($widget_id, $sidebars_widgets[$sbname], true))
 					$j++;
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
-			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
-			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+			echo "\t\t<option value=''>".__('&mdash; Select &mdash;')."</option>\n";
+			for ($i = 1; $i <= $j; $i++) {
+				if (in_array($widget_id, $sidebars_widgets[$sbname], true))
+					$selected = selected($i, $key + 1, false);
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -311,13 +311,13 @@ 
 
 	<div class="widget-control-actions">
 <?php
-	if ( isset($_GET['addnew']) ) { ?>
+	if (isset($_GET['addnew'])) { ?>
 	<a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
 <?php
 	} else {
-		submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
+		submit_button(__('Delete'), 'button alignleft', 'removewidget', false);
 	}
-	submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
+	submit_button(__('Save Widget'), 'button-primary alignright', 'savewidget', false); ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
@@ -328,7 +328,7 @@ 
 	</div>
 	</div>
 <?php
-	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -341,32 +341,32 @@ 
 	__('Error in displaying the widget settings form.')
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require_once(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
 <h1>
 <?php
-	echo esc_html( $title );
-	if ( current_user_can( 'customize' ) ) {
+	echo esc_html($title);
+	if (current_user_can('customize')) {
 		printf(
 			' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg(
+			esc_url(add_query_arg(
 				array(
-					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+					array('autofocus' => array('panel' => 'widgets')),
+					'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI']))
 				),
-				admin_url( 'customize.php' )
-			) ),
-			__( 'Manage in Customizer' )
+				admin_url('customize.php')
+			)),
+			__('Manage in Customizer')
 		);
 	}
 ?>
 </h1>
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<?php if (isset($_GET['message']) && isset($messages[$_GET['message']])) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
+<?php if (isset($_GET['error']) && isset($errors[$_GET['error']])) { ?>
 <div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
 <?php } ?>
 
@@ -376,14 +376,14 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'widgets_admin_page' ); ?>
+do_action('widgets_admin_page'); ?>
 
 <div class="widget-liquid-left">
 <div id="widgets-left">
 	<div id="available-widgets" class="widgets-holder-wrap">
 		<div class="sidebar-name">
 			<div class="sidebar-name-arrow"><br /></div>
-			<h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
+			<h2><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h2>
 		</div>
 		<div class="widget-holder">
 			<div class="sidebar-description">
@@ -400,40 +400,40 @@ 
 <?php
 
 $theme_sidebars = array();
-foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+foreach ($wp_registered_sidebars as $sidebar => $registered_sidebar) {
+	if (false !== strpos($registered_sidebar['class'], 'inactive-sidebar') || 'orphaned_widgets' == substr($sidebar, 0, 16)) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( ! empty($registered_sidebar['class']))
+			$wrap_class .= ' '.$registered_sidebar['class'];
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
-		<div class="<?php echo esc_attr( $wrap_class ); ?>">
+		<div class="<?php echo esc_attr($wrap_class); ?>">
 			<div class="widget-holder inactive">
-				<?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+				<?php wp_list_widget_controls($registered_sidebar['id'], $registered_sidebar['name']); ?>
 
-				<?php if ( $is_inactive_widgets ) { ?>
+				<?php if ($is_inactive_widgets) { ?>
 				<div class="remove-inactive-widgets">
 					<form action="" method="post">
 						<p>
 							<?php
-							$attributes = array( 'id' => 'inactive-widgets-control-remove' );
+							$attributes = array('id' => 'inactive-widgets-control-remove');
 
-							if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+							if (empty($sidebars_widgets['wp_inactive_widgets'])) {
 								$attributes['disabled'] = '';
 							}
 
-							submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+							submit_button(__('Clear Inactive Widgets'), 'delete', 'removeinactivewidgets', false, $attributes);
 							?>
 							<span class="spinner"></span>
 						</p>
-						<?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+						<?php wp_nonce_field('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets'); ?>
 					</form>
 				</div>
 				<?php } ?>
 			</div>
-			<?php if ( $is_inactive_widgets ) { ?>
-			<p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+			<?php if ($is_inactive_widgets) { ?>
+			<p class="description"><?php _e('This will clear all items from the inactive widgets list. You will not be able to restore any customizations.'); ?></p>
 			<?php } ?>
 		</div>
 		<?php
@@ -450,10 +450,10 @@ 
 
 $i = $split = 0;
 $single_sidebar_class = '';
-$sidebars_count = count( $theme_sidebars );
+$sidebars_count = count($theme_sidebars);
 
-if ( $sidebars_count > 1 ) {
-	$split = ceil( $sidebars_count / 2 );
+if ($sidebars_count > 1) {
+	$split = ceil($sidebars_count / 2);
 } else {
 	$single_sidebar_class = ' single-sidebar';
 }
@@ -464,23 +464,23 @@ 
 <div class="sidebars-column-1">
 <?php
 
-foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+foreach ($theme_sidebars as $sidebar => $registered_sidebar) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( ! empty($registered_sidebar['class']))
+		$wrap_class .= ' sidebar-'.$registered_sidebar['class'];
 
-	if ( $i > 0 )
+	if ($i > 0)
 		$wrap_class .= ' closed';
 
-	if ( $split && $i == $split ) {
+	if ($split && $i == $split) {
 		?>
 		</div><div class="sidebars-column-2">
 		<?php
 	}
 
 	?>
-	<div class="<?php echo esc_attr( $wrap_class ); ?>">
-		<?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
+	<div class="<?php echo esc_attr($wrap_class); ?>">
+		<?php wp_list_widget_controls($sidebar, $registered_sidebar['name']); // Show the control forms for each of the widgets in this sidebar ?>
 	</div>
 	<?php
 
@@ -492,7 +492,7 @@ 
 </div>
 </div>
 <form method="post">
-<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+<?php wp_nonce_field('save-sidebar-widgets', '_wpnonce_widgets', false); ?>
 </form>
 <br class="clear" />
 </div>
@@ -500,8 +500,8 @@ 
 <div class="widgets-chooser">
 	<ul class="widgets-chooser-sidebars"></ul>
 	<div class="widgets-chooser-actions">
-		<button class="button-secondary"><?php _e( 'Cancel' ); ?></button>
-		<button class="button-primary"><?php _e( 'Add Widget' ); ?></button>
+		<button class="button-secondary"><?php _e('Cancel'); ?></button>
+		<button class="button-primary"><?php _e('Add Widget'); ?></button>
 	</div>
 </div>
 
@@ -512,5 +512,5 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_page' );
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+do_action('sidebar_admin_page');
+require_once(ABSPATH.'wp-admin/admin-footer.php');

Braces +45 added lines, -30 removed lines

@@ -31,9 +31,10 @@ 
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
-}
+	if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+	}
+	}
 
 /**
  * Fires early before the Widgets administration screen loads,
@@ -82,12 +83,14 @@ 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if ( empty( $sidebars_widgets ) ) {
 	$sidebars_widgets = wp_get_widget_defaults();
+}
 
 foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
-		continue;
+	if ( 'wp_inactive_widgets' == $sidebar_id ) {
+			continue;
+	}
 
 	if ( ! is_registered_sidebar( $sidebar_id ) ) {
 		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
@@ -168,8 +171,9 @@ 
 	$_POST['widget-id'] = $sidebar;
 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
-			continue;
+		if ( $name != $id_base || !is_callable($control['callback']) ) {
+					continue;
+		}
 
 		ob_start();
 			call_user_func_array( $control['callback'], $control['params'] );
@@ -183,8 +187,9 @@ 
 	// Remove old position.
 	if ( !isset($_POST['delete_widget']) ) {
 		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			if ( is_array($sb) ) {
+							$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			}
 		}
 		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
 	}
@@ -247,14 +252,17 @@ 
 		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( !isset($name) ) {
+			$name = esc_html( strip_tags($control['name']) );
+	}
 
-	if ( !isset($sidebar) )
-		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	if ( !isset($sidebar) ) {
+			$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	}
 
-	if ( !isset($multi_number) )
-		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	if ( !isset($multi_number) ) {
+			$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	}
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
@@ -271,10 +279,12 @@ 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
-	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+	if ( is_callable( $control_callback ) ) {
+			call_user_func_array( $control_callback, $control['params'] );
+	} else {
+			echo '<p>' . __('There are no options for this widget.') . "</p>\n";
+	}
+	?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
@@ -291,15 +301,17 @@ 
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$j++;
+				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$j++;
+				}
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
 			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
 			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$selected = selected( $i, $key + 1, false );
+				}
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -403,8 +415,9 @@ 
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( !empty( $registered_sidebar['class'] ) ) {
+					$wrap_class .= ' ' . $registered_sidebar['class'];
+		}
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
@@ -466,11 +479,13 @@ 
 
 foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( !empty( $registered_sidebar['class'] ) ) {
+			$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	}
 
-	if ( $i > 0 )
-		$wrap_class .= ' closed';
+	if ( $i > 0 ) {
+			$wrap_class .= ' closed';
+	}
 
 	if ( $split && $i == $split ) {
 		?>