iqltechnologies / brighty

brighty/wp-admin/includes/misc.php

Indentation +979 added lines, -979 removed lines

@@ -14,21 +14,21 @@ 
  * @return bool Whether the server is running Apache with the mod_rewrite module loaded.
  */
 function got_mod_rewrite() {
-	$got_rewrite = apache_mod_loaded( 'mod_rewrite', true );
-
-	/**
-	 * Filters whether Apache and mod_rewrite are present.
-	 *
-	 * This filter was previously used to force URL rewriting for other servers,
-	 * like nginx. Use the {@see 'got_url_rewrite'} filter in got_url_rewrite() instead.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @see got_url_rewrite()
-	 *
-	 * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
-	 */
-	return apply_filters( 'got_rewrite', $got_rewrite );
+    $got_rewrite = apache_mod_loaded( 'mod_rewrite', true );
+
+    /**
+     * Filters whether Apache and mod_rewrite are present.
+     *
+     * This filter was previously used to force URL rewriting for other servers,
+     * like nginx. Use the {@see 'got_url_rewrite'} filter in got_url_rewrite() instead.
+     *
+     * @since 2.5.0
+     *
+     * @see got_url_rewrite()
+     *
+     * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
+     */
+    return apply_filters( 'got_rewrite', $got_rewrite );
 }
 
 /**
@@ -43,16 +43,16 @@ 
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-	$got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
-
-	/**
-	 * Filters whether URL rewriting is available.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param bool $got_url_rewrite Whether URL rewriting is available.
-	 */
-	return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+    $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+
+    /**
+     * Filters whether URL rewriting is available.
+     *
+     * @since 3.7.0
+     *
+     * @param bool $got_url_rewrite Whether URL rewriting is available.
+     */
+    return apply_filters( 'got_url_rewrite', $got_url_rewrite );
 }
 
 /**
@@ -65,35 +65,35 @@ 
  * @return string[] An array of strings from a file (.htaccess) from between BEGIN and END markers.
  */
 function extract_from_markers( $filename, $marker ) {
-	$result = array();
+    $result = array();
 
-	if ( ! file_exists( $filename ) ) {
-		return $result;
-	}
+    if ( ! file_exists( $filename ) ) {
+        return $result;
+    }
 
-	$markerdata = explode( "\n", implode( '', file( $filename ) ) );
+    $markerdata = explode( "\n", implode( '', file( $filename ) ) );
 
-	$state = false;
+    $state = false;
 
-	foreach ( $markerdata as $markerline ) {
-		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
-			$state = false;
-		}
+    foreach ( $markerdata as $markerline ) {
+        if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
+            $state = false;
+        }
 
-		if ( $state ) {
-			if ( '#' === substr( $markerline, 0, 1 ) ) {
-				continue;
-			}
+        if ( $state ) {
+            if ( '#' === substr( $markerline, 0, 1 ) ) {
+                continue;
+            }
 
-			$result[] = $markerline;
-		}
+            $result[] = $markerline;
+        }
 
-		if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
-			$state = true;
-		}
-	}
+        if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+            $state = true;
+        }
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -111,139 +111,139 @@ 
  * @return bool True on write success, false on failure.
  */
 function insert_with_markers( $filename, $marker, $insertion ) {
-	if ( ! file_exists( $filename ) ) {
-		if ( ! is_writable( dirname( $filename ) ) ) {
-			return false;
-		}
-
-		if ( ! touch( $filename ) ) {
-			return false;
-		}
-
-		// Make sure the file is created with a minimum set of permissions.
-		$perms = fileperms( $filename );
-
-		if ( $perms ) {
-			chmod( $filename, $perms | 0644 );
-		}
-	} elseif ( ! is_writable( $filename ) ) {
-		return false;
-	}
-
-	if ( ! is_array( $insertion ) ) {
-		$insertion = explode( "\n", $insertion );
-	}
-
-	$switched_locale = switch_to_locale( get_locale() );
-
-	$instructions = sprintf(
-		/* translators: 1: Marker. */
-		__(
-			'The directives (lines) between "BEGIN %1$s" and "END %1$s" are
+    if ( ! file_exists( $filename ) ) {
+        if ( ! is_writable( dirname( $filename ) ) ) {
+            return false;
+        }
+
+        if ( ! touch( $filename ) ) {
+            return false;
+        }
+
+        // Make sure the file is created with a minimum set of permissions.
+        $perms = fileperms( $filename );
+
+        if ( $perms ) {
+            chmod( $filename, $perms | 0644 );
+        }
+    } elseif ( ! is_writable( $filename ) ) {
+        return false;
+    }
+
+    if ( ! is_array( $insertion ) ) {
+        $insertion = explode( "\n", $insertion );
+    }
+
+    $switched_locale = switch_to_locale( get_locale() );
+
+    $instructions = sprintf(
+        /* translators: 1: Marker. */
+        __(
+            'The directives (lines) between "BEGIN %1$s" and "END %1$s" are
 dynamically generated, and should only be modified via WordPress filters.
 Any changes to the directives between these markers will be overwritten.'
-		),
-		$marker
-	);
-
-	$instructions = explode( "\n", $instructions );
-
-	foreach ( $instructions as $line => $text ) {
-		$instructions[ $line ] = '# ' . $text;
-	}
-
-	/**
-	 * Filters the inline instructions inserted before the dynamically generated content.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param string[] $instructions Array of lines with inline instructions.
-	 * @param string   $marker       The marker being inserted.
-	 */
-	$instructions = apply_filters( 'insert_with_markers_inline_instructions', $instructions, $marker );
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
-
-	$insertion = array_merge( $instructions, $insertion );
-
-	$start_marker = "# BEGIN {$marker}";
-	$end_marker   = "# END {$marker}";
-
-	$fp = fopen( $filename, 'r+' );
-
-	if ( ! $fp ) {
-		return false;
-	}
-
-	// Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
-	flock( $fp, LOCK_EX );
-
-	$lines = array();
-
-	while ( ! feof( $fp ) ) {
-		$lines[] = rtrim( fgets( $fp ), "\r\n" );
-	}
-
-	// Split out the existing file into the preceding lines, and those that appear after the marker.
-	$pre_lines        = array();
-	$post_lines       = array();
-	$existing_lines   = array();
-	$found_marker     = false;
-	$found_end_marker = false;
-
-	foreach ( $lines as $line ) {
-		if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
-			$found_marker = true;
-			continue;
-		} elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
-			$found_end_marker = true;
-			continue;
-		}
-
-		if ( ! $found_marker ) {
-			$pre_lines[] = $line;
-		} elseif ( $found_marker && $found_end_marker ) {
-			$post_lines[] = $line;
-		} else {
-			$existing_lines[] = $line;
-		}
-	}
-
-	// Check to see if there was a change.
-	if ( $existing_lines === $insertion ) {
-		flock( $fp, LOCK_UN );
-		fclose( $fp );
-
-		return true;
-	}
-
-	// Generate the new file data.
-	$new_file_data = implode(
-		"\n",
-		array_merge(
-			$pre_lines,
-			array( $start_marker ),
-			$insertion,
-			array( $end_marker ),
-			$post_lines
-		)
-	);
-
-	// Write to the start of the file, and truncate it to that length.
-	fseek( $fp, 0 );
-	$bytes = fwrite( $fp, $new_file_data );
-
-	if ( $bytes ) {
-		ftruncate( $fp, ftell( $fp ) );
-	}
-
-	fflush( $fp );
-	flock( $fp, LOCK_UN );
-	fclose( $fp );
-
-	return (bool) $bytes;
+        ),
+        $marker
+    );
+
+    $instructions = explode( "\n", $instructions );
+
+    foreach ( $instructions as $line => $text ) {
+        $instructions[ $line ] = '# ' . $text;
+    }
+
+    /**
+     * Filters the inline instructions inserted before the dynamically generated content.
+     *
+     * @since 5.3.0
+     *
+     * @param string[] $instructions Array of lines with inline instructions.
+     * @param string   $marker       The marker being inserted.
+     */
+    $instructions = apply_filters( 'insert_with_markers_inline_instructions', $instructions, $marker );
+
+    if ( $switched_locale ) {
+        restore_previous_locale();
+    }
+
+    $insertion = array_merge( $instructions, $insertion );
+
+    $start_marker = "# BEGIN {$marker}";
+    $end_marker   = "# END {$marker}";
+
+    $fp = fopen( $filename, 'r+' );
+
+    if ( ! $fp ) {
+        return false;
+    }
+
+    // Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
+    flock( $fp, LOCK_EX );
+
+    $lines = array();
+
+    while ( ! feof( $fp ) ) {
+        $lines[] = rtrim( fgets( $fp ), "\r\n" );
+    }
+
+    // Split out the existing file into the preceding lines, and those that appear after the marker.
+    $pre_lines        = array();
+    $post_lines       = array();
+    $existing_lines   = array();
+    $found_marker     = false;
+    $found_end_marker = false;
+
+    foreach ( $lines as $line ) {
+        if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+            $found_marker = true;
+            continue;
+        } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+            $found_end_marker = true;
+            continue;
+        }
+
+        if ( ! $found_marker ) {
+            $pre_lines[] = $line;
+        } elseif ( $found_marker && $found_end_marker ) {
+            $post_lines[] = $line;
+        } else {
+            $existing_lines[] = $line;
+        }
+    }
+
+    // Check to see if there was a change.
+    if ( $existing_lines === $insertion ) {
+        flock( $fp, LOCK_UN );
+        fclose( $fp );
+
+        return true;
+    }
+
+    // Generate the new file data.
+    $new_file_data = implode(
+        "\n",
+        array_merge(
+            $pre_lines,
+            array( $start_marker ),
+            $insertion,
+            array( $end_marker ),
+            $post_lines
+        )
+    );
+
+    // Write to the start of the file, and truncate it to that length.
+    fseek( $fp, 0 );
+    $bytes = fwrite( $fp, $new_file_data );
+
+    if ( $bytes ) {
+        ftruncate( $fp, ftell( $fp ) );
+    }
+
+    fflush( $fp );
+    flock( $fp, LOCK_UN );
+    fclose( $fp );
+
+    return (bool) $bytes;
 }
 
 /**
@@ -259,33 +259,33 @@ 
  * @return bool|null True on write success, false on failure. Null in multisite.
  */
 function save_mod_rewrite_rules() {
-	global $wp_rewrite;
+    global $wp_rewrite;
 
-	if ( is_multisite() ) {
-		return;
-	}
+    if ( is_multisite() ) {
+        return;
+    }
 
-	// Ensure get_home_path() is declared.
-	require_once ABSPATH . 'wp-admin/includes/file.php';
+    // Ensure get_home_path() is declared.
+    require_once ABSPATH . 'wp-admin/includes/file.php';
 
-	$home_path     = get_home_path();
-	$htaccess_file = $home_path . '.htaccess';
+    $home_path     = get_home_path();
+    $htaccess_file = $home_path . '.htaccess';
 
-	/*
+    /*
 	 * If the file doesn't already exist check for write access to the directory
 	 * and whether we have some rules. Else check for write access to the file.
 	 */
-	if ( ! file_exists( $htaccess_file ) && is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
-		|| is_writable( $htaccess_file )
-	) {
-		if ( got_mod_rewrite() ) {
-			$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
+    if ( ! file_exists( $htaccess_file ) && is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
+        || is_writable( $htaccess_file )
+    ) {
+        if ( got_mod_rewrite() ) {
+            $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
 
-			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
-		}
-	}
+            return insert_with_markers( $htaccess_file, 'WordPress', $rules );
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -299,33 +299,33 @@ 
  * @return bool|null True on write success, false on failure. Null in multisite.
  */
 function iis7_save_url_rewrite_rules() {
-	global $wp_rewrite;
+    global $wp_rewrite;
 
-	if ( is_multisite() ) {
-		return;
-	}
+    if ( is_multisite() ) {
+        return;
+    }
 
-	// Ensure get_home_path() is declared.
-	require_once ABSPATH . 'wp-admin/includes/file.php';
+    // Ensure get_home_path() is declared.
+    require_once ABSPATH . 'wp-admin/includes/file.php';
 
-	$home_path       = get_home_path();
-	$web_config_file = $home_path . 'web.config';
+    $home_path       = get_home_path();
+    $web_config_file = $home_path . 'web.config';
 
-	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP.
-	if ( iis7_supports_permalinks()
-		&& ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
-			|| win_is_writable( $web_config_file ) )
-	) {
-		$rule = $wp_rewrite->iis7_url_rewrite_rules( false );
+    // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP.
+    if ( iis7_supports_permalinks()
+        && ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
+            || win_is_writable( $web_config_file ) )
+    ) {
+        $rule = $wp_rewrite->iis7_url_rewrite_rules( false );
 
-		if ( ! empty( $rule ) ) {
-			return iis7_add_rewrite_rule( $web_config_file, $rule );
-		} else {
-			return iis7_delete_rewrite_rule( $web_config_file );
-		}
-	}
+        if ( ! empty( $rule ) ) {
+            return iis7_add_rewrite_rule( $web_config_file, $rule );
+        } else {
+            return iis7_delete_rewrite_rule( $web_config_file );
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -336,22 +336,22 @@ 
  * @param string $file
  */
 function update_recently_edited( $file ) {
-	$oldfiles = (array) get_option( 'recently_edited' );
-
-	if ( $oldfiles ) {
-		$oldfiles   = array_reverse( $oldfiles );
-		$oldfiles[] = $file;
-		$oldfiles   = array_reverse( $oldfiles );
-		$oldfiles   = array_unique( $oldfiles );
-
-		if ( 5 < count( $oldfiles ) ) {
-			array_pop( $oldfiles );
-		}
-	} else {
-		$oldfiles[] = $file;
-	}
-
-	update_option( 'recently_edited', $oldfiles );
+    $oldfiles = (array) get_option( 'recently_edited' );
+
+    if ( $oldfiles ) {
+        $oldfiles   = array_reverse( $oldfiles );
+        $oldfiles[] = $file;
+        $oldfiles   = array_reverse( $oldfiles );
+        $oldfiles   = array_unique( $oldfiles );
+
+        if ( 5 < count( $oldfiles ) ) {
+            array_pop( $oldfiles );
+        }
+    } else {
+        $oldfiles[] = $file;
+    }
+
+    update_option( 'recently_edited', $oldfiles );
 }
 
 /**
@@ -364,20 +364,20 @@ 
  * @return array Tree structure for listing theme files.
  */
 function wp_make_theme_file_tree( $allowed_files ) {
-	$tree_list = array();
+    $tree_list = array();
 
-	foreach ( $allowed_files as $file_name => $absolute_filename ) {
-		$list     = explode( '/', $file_name );
-		$last_dir = &$tree_list;
+    foreach ( $allowed_files as $file_name => $absolute_filename ) {
+        $list     = explode( '/', $file_name );
+        $last_dir = &$tree_list;
 
-		foreach ( $list as $dir ) {
-			$last_dir =& $last_dir[ $dir ];
-		}
+        foreach ( $list as $dir ) {
+            $last_dir =& $last_dir[ $dir ];
+        }
 
-		$last_dir = $file_name;
-	}
+        $last_dir = $file_name;
+    }
 
-	return $tree_list;
+    return $tree_list;
 }
 
 /**
@@ -396,20 +396,20 @@ 
  * @param int          $index The aria-posinset for the current iteration.
  */
 function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
-	global $relative_file, $stylesheet;
+    global $relative_file, $stylesheet;
 
-	if ( is_array( $tree ) ) {
-		$index = 0;
-		$size  = count( $tree );
+    if ( is_array( $tree ) ) {
+        $index = 0;
+        $size  = count( $tree );
 
-		foreach ( $tree as $label => $theme_file ) :
-			$index++;
+        foreach ( $tree as $label => $theme_file ) :
+            $index++;
 
-			if ( ! is_array( $theme_file ) ) {
-				wp_print_theme_file_tree( $theme_file, $level, $index, $size );
-				continue;
-			}
-			?>
+            if ( ! is_array( $theme_file ) ) {
+                wp_print_theme_file_tree( $theme_file, $level, $index, $size );
+                continue;
+            }
+            ?>
 			<li role="treeitem" aria-expanded="true" tabindex="-1"
 				aria-level="<?php echo esc_attr( $level ); ?>"
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
@@ -418,17 +418,17 @@ 
 				<ul role="group" class="tree-folder"><?php wp_print_theme_file_tree( $theme_file, $level + 1, $index, $size ); ?></ul>
 			</li>
 			<?php
-		endforeach;
-	} else {
-		$filename = $tree;
-		$url      = add_query_arg(
-			array(
-				'file'  => rawurlencode( $tree ),
-				'theme' => rawurlencode( $stylesheet ),
-			),
-			self_admin_url( 'theme-editor.php' )
-		);
-		?>
+        endforeach;
+    } else {
+        $filename = $tree;
+        $url      = add_query_arg(
+            array(
+                'file'  => rawurlencode( $tree ),
+                'theme' => rawurlencode( $stylesheet ),
+            ),
+            self_admin_url( 'theme-editor.php' )
+        );
+        ?>
 		<li role="none" class="<?php echo esc_attr( $relative_file === $filename ? 'current-file' : '' ); ?>">
 			<a role="treeitem" tabindex="<?php echo esc_attr( $relative_file === $filename ? '0' : '-1' ); ?>"
 				href="<?php echo esc_url( $url ); ?>"
@@ -436,22 +436,22 @@ 
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
 				aria-posinset="<?php echo esc_attr( $index ); ?>">
 				<?php
-				$file_description = esc_html( get_file_description( $filename ) );
-
-				if ( $file_description !== $filename && wp_basename( $filename ) !== $file_description ) {
-					$file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
-				}
-
-				if ( $relative_file === $filename ) {
-					echo '<span class="notice notice-info">' . $file_description . '</span>';
-				} else {
-					echo $file_description;
-				}
-				?>
+                $file_description = esc_html( get_file_description( $filename ) );
+
+                if ( $file_description !== $filename && wp_basename( $filename ) !== $file_description ) {
+                    $file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
+                }
+
+                if ( $relative_file === $filename ) {
+                    echo '<span class="notice notice-info">' . $file_description . '</span>';
+                } else {
+                    echo $file_description;
+                }
+                ?>
 			</a>
 		</li>
 		<?php
-	}
+    }
 }
 
 /**
@@ -464,20 +464,20 @@ 
  * @return array Tree structure for listing plugin files.
  */
 function wp_make_plugin_file_tree( $plugin_editable_files ) {
-	$tree_list = array();
+    $tree_list = array();
 
-	foreach ( $plugin_editable_files as $plugin_file ) {
-		$list     = explode( '/', preg_replace( '#^.+?/#', '', $plugin_file ) );
-		$last_dir = &$tree_list;
+    foreach ( $plugin_editable_files as $plugin_file ) {
+        $list     = explode( '/', preg_replace( '#^.+?/#', '', $plugin_file ) );
+        $last_dir = &$tree_list;
 
-		foreach ( $list as $dir ) {
-			$last_dir =& $last_dir[ $dir ];
-		}
+        foreach ( $list as $dir ) {
+            $last_dir =& $last_dir[ $dir ];
+        }
 
-		$last_dir = $plugin_file;
-	}
+        $last_dir = $plugin_file;
+    }
 
-	return $tree_list;
+    return $tree_list;
 }
 
 /**
@@ -493,20 +493,20 @@ 
  * @param int          $index The aria-posinset for the current iteration.
  */
 function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $index = 1 ) {
-	global $file, $plugin;
+    global $file, $plugin;
 
-	if ( is_array( $tree ) ) {
-		$index = 0;
-		$size  = count( $tree );
+    if ( is_array( $tree ) ) {
+        $index = 0;
+        $size  = count( $tree );
 
-		foreach ( $tree as $label => $plugin_file ) :
-			$index++;
+        foreach ( $tree as $label => $plugin_file ) :
+            $index++;
 
-			if ( ! is_array( $plugin_file ) ) {
-				wp_print_plugin_file_tree( $plugin_file, $label, $level, $index, $size );
-				continue;
-			}
-			?>
+            if ( ! is_array( $plugin_file ) ) {
+                wp_print_plugin_file_tree( $plugin_file, $label, $level, $index, $size );
+                continue;
+            }
+            ?>
 			<li role="treeitem" aria-expanded="true" tabindex="-1"
 				aria-level="<?php echo esc_attr( $level ); ?>"
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
@@ -515,16 +515,16 @@ 
 				<ul role="group" class="tree-folder"><?php wp_print_plugin_file_tree( $plugin_file, '', $level + 1, $index, $size ); ?></ul>
 			</li>
 			<?php
-		endforeach;
-	} else {
-		$url = add_query_arg(
-			array(
-				'file'   => rawurlencode( $tree ),
-				'plugin' => rawurlencode( $plugin ),
-			),
-			self_admin_url( 'plugin-editor.php' )
-		);
-		?>
+        endforeach;
+    } else {
+        $url = add_query_arg(
+            array(
+                'file'   => rawurlencode( $tree ),
+                'plugin' => rawurlencode( $plugin ),
+            ),
+            self_admin_url( 'plugin-editor.php' )
+        );
+        ?>
 		<li role="none" class="<?php echo esc_attr( $file === $tree ? 'current-file' : '' ); ?>">
 			<a role="treeitem" tabindex="<?php echo esc_attr( $file === $tree ? '0' : '-1' ); ?>"
 				href="<?php echo esc_url( $url ); ?>"
@@ -532,16 +532,16 @@ 
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
 				aria-posinset="<?php echo esc_attr( $index ); ?>">
 				<?php
-				if ( $file === $tree ) {
-					echo '<span class="notice notice-info">' . esc_html( $label ) . '</span>';
-				} else {
-					echo esc_html( $label );
-				}
-				?>
+                if ( $file === $tree ) {
+                    echo '<span class="notice notice-info">' . esc_html( $label ) . '</span>';
+                } else {
+                    echo esc_html( $label );
+                }
+                ?>
 			</a>
 		</li>
 		<?php
-	}
+    }
 }
 
 /**
@@ -553,15 +553,15 @@ 
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-	if ( wp_installing() ) {
-		return;
-	}
-
-	if ( is_multisite() && ms_is_switched() ) {
-		delete_option( 'rewrite_rules' );
-	} else {
-		flush_rewrite_rules();
-	}
+    if ( wp_installing() ) {
+        return;
+    }
+
+    if ( is_multisite() && ms_is_switched() ) {
+        delete_option( 'rewrite_rules' );
+    } else {
+        flush_rewrite_rules();
+    }
 }
 
 
@@ -577,17 +577,17 @@ 
  * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
-	foreach ( $vars as $var ) {
-		if ( empty( $_POST[ $var ] ) ) {
-			if ( empty( $_GET[ $var ] ) ) {
-				$GLOBALS[ $var ] = '';
-			} else {
-				$GLOBALS[ $var ] = $_GET[ $var ];
-			}
-		} else {
-			$GLOBALS[ $var ] = $_POST[ $var ];
-		}
-	}
+    foreach ( $vars as $var ) {
+        if ( empty( $_POST[ $var ] ) ) {
+            if ( empty( $_GET[ $var ] ) ) {
+                $GLOBALS[ $var ] = '';
+            } else {
+                $GLOBALS[ $var ] = $_GET[ $var ];
+            }
+        } else {
+            $GLOBALS[ $var ] = $_POST[ $var ];
+        }
+    }
 }
 
 /**
@@ -598,17 +598,17 @@ 
  * @param string|WP_Error $message
  */
 function show_message( $message ) {
-	if ( is_wp_error( $message ) ) {
-		if ( $message->get_error_data() && is_string( $message->get_error_data() ) ) {
-			$message = $message->get_error_message() . ': ' . $message->get_error_data();
-		} else {
-			$message = $message->get_error_message();
-		}
-	}
-
-	echo "<p>$message</p>\n";
-	wp_ob_end_flush_all();
-	flush();
+    if ( is_wp_error( $message ) ) {
+        if ( $message->get_error_data() && is_string( $message->get_error_data() ) ) {
+            $message = $message->get_error_message() . ': ' . $message->get_error_data();
+        } else {
+            $message = $message->get_error_message();
+        }
+    }
+
+    echo "<p>$message</p>\n";
+    wp_ob_end_flush_all();
+    flush();
 }
 
 /**
@@ -618,62 +618,62 @@ 
  * @return array
  */
 function wp_doc_link_parse( $content ) {
-	if ( ! is_string( $content ) || empty( $content ) ) {
-		return array();
-	}
-
-	if ( ! function_exists( 'token_get_all' ) ) {
-		return array();
-	}
-
-	$tokens           = token_get_all( $content );
-	$count            = count( $tokens );
-	$functions        = array();
-	$ignore_functions = array();
-
-	for ( $t = 0; $t < $count - 2; $t++ ) {
-		if ( ! is_array( $tokens[ $t ] ) ) {
-			continue;
-		}
-
-		if ( T_STRING === $tokens[ $t ][0] && ( '(' === $tokens[ $t + 1 ] || '(' === $tokens[ $t + 2 ] ) ) {
-			// If it's a function or class defined locally, there's not going to be any docs available.
-			if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ), true ) )
-				|| ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR === $tokens[ $t - 1 ][0] )
-			) {
-				$ignore_functions[] = $tokens[ $t ][1];
-			}
-
-			// Add this to our stack of unique references.
-			$functions[] = $tokens[ $t ][1];
-		}
-	}
-
-	$functions = array_unique( $functions );
-	sort( $functions );
-
-	/**
-	 * Filters the list of functions and classes to be ignored from the documentation lookup.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param string[] $ignore_functions Array of names of functions and classes to be ignored.
-	 */
-	$ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
-
-	$ignore_functions = array_unique( $ignore_functions );
-
-	$out = array();
-
-	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions, true ) ) {
-			continue;
-		}
-
-		$out[] = $function;
-	}
-
-	return $out;
+    if ( ! is_string( $content ) || empty( $content ) ) {
+        return array();
+    }
+
+    if ( ! function_exists( 'token_get_all' ) ) {
+        return array();
+    }
+
+    $tokens           = token_get_all( $content );
+    $count            = count( $tokens );
+    $functions        = array();
+    $ignore_functions = array();
+
+    for ( $t = 0; $t < $count - 2; $t++ ) {
+        if ( ! is_array( $tokens[ $t ] ) ) {
+            continue;
+        }
+
+        if ( T_STRING === $tokens[ $t ][0] && ( '(' === $tokens[ $t + 1 ] || '(' === $tokens[ $t + 2 ] ) ) {
+            // If it's a function or class defined locally, there's not going to be any docs available.
+            if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ), true ) )
+                || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR === $tokens[ $t - 1 ][0] )
+            ) {
+                $ignore_functions[] = $tokens[ $t ][1];
+            }
+
+            // Add this to our stack of unique references.
+            $functions[] = $tokens[ $t ][1];
+        }
+    }
+
+    $functions = array_unique( $functions );
+    sort( $functions );
+
+    /**
+     * Filters the list of functions and classes to be ignored from the documentation lookup.
+     *
+     * @since 2.8.0
+     *
+     * @param string[] $ignore_functions Array of names of functions and classes to be ignored.
+     */
+    $ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
+
+    $ignore_functions = array_unique( $ignore_functions );
+
+    $out = array();
+
+    foreach ( $functions as $function ) {
+        if ( in_array( $function, $ignore_functions, true ) ) {
+            continue;
+        }
+
+        $out[] = $function;
+    }
+
+    return $out;
 }
 
 /**
@@ -682,122 +682,122 @@ 
  * @since 2.8.0
  */
 function set_screen_options() {
-	if ( ! isset( $_POST['wp_screen_options'] ) || ! is_array( $_POST['wp_screen_options'] ) ) {
-		return;
-	}
-
-	check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
-
-	$user = wp_get_current_user();
-
-	if ( ! $user ) {
-		return;
-	}
-
-	$option = $_POST['wp_screen_options']['option'];
-	$value  = $_POST['wp_screen_options']['value'];
-
-	if ( sanitize_key( $option ) !== $option ) {
-		return;
-	}
-
-	$map_option = $option;
-	$type       = str_replace( 'edit_', '', $map_option );
-	$type       = str_replace( '_per_page', '', $type );
-
-	if ( in_array( $type, get_taxonomies(), true ) ) {
-		$map_option = 'edit_tags_per_page';
-	} elseif ( in_array( $type, get_post_types(), true ) ) {
-		$map_option = 'edit_per_page';
-	} else {
-		$option = str_replace( '-', '_', $option );
-	}
-
-	switch ( $map_option ) {
-		case 'edit_per_page':
-		case 'users_per_page':
-		case 'edit_comments_per_page':
-		case 'upload_per_page':
-		case 'edit_tags_per_page':
-		case 'plugins_per_page':
-		case 'export_personal_data_requests_per_page':
-		case 'remove_personal_data_requests_per_page':
-			// Network admin.
-		case 'sites_network_per_page':
-		case 'users_network_per_page':
-		case 'site_users_network_per_page':
-		case 'plugins_network_per_page':
-		case 'themes_network_per_page':
-		case 'site_themes_network_per_page':
-			$value = (int) $value;
-
-			if ( $value < 1 || $value > 999 ) {
-				return;
-			}
-
-			break;
-
-		default:
-			$screen_option = false;
-
-			if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
-				/**
-				 * Filters a screen option value before it is set.
-				 *
-				 * The filter can also be used to modify non-standard [items]_per_page
-				 * settings. See the parent function for a full list of standard options.
-				 *
-				 * Returning false from the filter will skip saving the current option.
-				 *
-				 * @since 2.8.0
-				 * @since 5.4.2 Only applied to options ending with '_page',
-				 *              or the 'layout_columns' option.
-				 *
-				 * @see set_screen_options()
-				 *
-				 * @param mixed  $screen_option The value to save instead of the option value.
-				 *                              Default false (to skip saving the current option).
-				 * @param string $option        The option name.
-				 * @param int    $value         The option value.
-				 */
-				$screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			}
-
-			/**
-			 * Filters a screen option value before it is set.
-			 *
-			 * The dynamic portion of the hook name, `$option`, refers to the option name.
-			 *
-			 * Returning false from the filter will skip saving the current option.
-			 *
-			 * @since 5.4.2
-			 *
-			 * @see set_screen_options()
-			 *
-			 * @param mixed   $screen_option The value to save instead of the option value.
-			 *                               Default false (to skip saving the current option).
-			 * @param string  $option        The option name.
-			 * @param int     $value         The option value.
-			 */
-			$value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
-
-			if ( false === $value ) {
-				return;
-			}
-
-			break;
-	}
-
-	update_user_meta( $user->ID, $option, $value );
-
-	$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
-
-	if ( isset( $_POST['mode'] ) ) {
-		$url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
-	}
-
-	wp_safe_redirect( $url );
-	exit;
+    if ( ! isset( $_POST['wp_screen_options'] ) || ! is_array( $_POST['wp_screen_options'] ) ) {
+        return;
+    }
+
+    check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+
+    $user = wp_get_current_user();
+
+    if ( ! $user ) {
+        return;
+    }
+
+    $option = $_POST['wp_screen_options']['option'];
+    $value  = $_POST['wp_screen_options']['value'];
+
+    if ( sanitize_key( $option ) !== $option ) {
+        return;
+    }
+
+    $map_option = $option;
+    $type       = str_replace( 'edit_', '', $map_option );
+    $type       = str_replace( '_per_page', '', $type );
+
+    if ( in_array( $type, get_taxonomies(), true ) ) {
+        $map_option = 'edit_tags_per_page';
+    } elseif ( in_array( $type, get_post_types(), true ) ) {
+        $map_option = 'edit_per_page';
+    } else {
+        $option = str_replace( '-', '_', $option );
+    }
+
+    switch ( $map_option ) {
+        case 'edit_per_page':
+        case 'users_per_page':
+        case 'edit_comments_per_page':
+        case 'upload_per_page':
+        case 'edit_tags_per_page':
+        case 'plugins_per_page':
+        case 'export_personal_data_requests_per_page':
+        case 'remove_personal_data_requests_per_page':
+            // Network admin.
+        case 'sites_network_per_page':
+        case 'users_network_per_page':
+        case 'site_users_network_per_page':
+        case 'plugins_network_per_page':
+        case 'themes_network_per_page':
+        case 'site_themes_network_per_page':
+            $value = (int) $value;
+
+            if ( $value < 1 || $value > 999 ) {
+                return;
+            }
+
+            break;
+
+        default:
+            $screen_option = false;
+
+            if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+                /**
+                 * Filters a screen option value before it is set.
+                 *
+                 * The filter can also be used to modify non-standard [items]_per_page
+                 * settings. See the parent function for a full list of standard options.
+                 *
+                 * Returning false from the filter will skip saving the current option.
+                 *
+                 * @since 2.8.0
+                 * @since 5.4.2 Only applied to options ending with '_page',
+                 *              or the 'layout_columns' option.
+                 *
+                 * @see set_screen_options()
+                 *
+                 * @param mixed  $screen_option The value to save instead of the option value.
+                 *                              Default false (to skip saving the current option).
+                 * @param string $option        The option name.
+                 * @param int    $value         The option value.
+                 */
+                $screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+            }
+
+            /**
+             * Filters a screen option value before it is set.
+             *
+             * The dynamic portion of the hook name, `$option`, refers to the option name.
+             *
+             * Returning false from the filter will skip saving the current option.
+             *
+             * @since 5.4.2
+             *
+             * @see set_screen_options()
+             *
+             * @param mixed   $screen_option The value to save instead of the option value.
+             *                               Default false (to skip saving the current option).
+             * @param string  $option        The option name.
+             * @param int     $value         The option value.
+             */
+            $value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
+
+            if ( false === $value ) {
+                return;
+            }
+
+            break;
+    }
+
+    update_user_meta( $user->ID, $option, $value );
+
+    $url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
+
+    if ( isset( $_POST['mode'] ) ) {
+        $url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+    }
+
+    wp_safe_redirect( $url );
+    exit;
 }
 
 /**
@@ -809,28 +809,28 @@ 
  * @return bool
  */
 function iis7_rewrite_rule_exists( $filename ) {
-	if ( ! file_exists( $filename ) ) {
-		return false;
-	}
+    if ( ! file_exists( $filename ) ) {
+        return false;
+    }
 
-	if ( ! class_exists( 'DOMDocument', false ) ) {
-		return false;
-	}
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
 
-	$doc = new DOMDocument();
+    $doc = new DOMDocument();
 
-	if ( $doc->load( $filename ) === false ) {
-		return false;
-	}
+    if ( $doc->load( $filename ) === false ) {
+        return false;
+    }
 
-	$xpath = new DOMXPath( $doc );
-	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+    $xpath = new DOMXPath( $doc );
+    $rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
 
-	if ( 0 === $rules->length ) {
-		return false;
-	}
+    if ( 0 === $rules->length ) {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 /**
@@ -842,34 +842,34 @@ 
  * @return bool
  */
 function iis7_delete_rewrite_rule( $filename ) {
-	// If configuration file does not exist then rules also do not exist, so there is nothing to delete.
-	if ( ! file_exists( $filename ) ) {
-		return true;
-	}
-
-	if ( ! class_exists( 'DOMDocument', false ) ) {
-		return false;
-	}
-
-	$doc                     = new DOMDocument();
-	$doc->preserveWhiteSpace = false;
-
-	if ( $doc->load( $filename ) === false ) {
-		return false;
-	}
-
-	$xpath = new DOMXPath( $doc );
-	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
-
-	if ( $rules->length > 0 ) {
-		$child  = $rules->item( 0 );
-		$parent = $child->parentNode;
-		$parent->removeChild( $child );
-		$doc->formatOutput = true;
-		saveDomDocument( $doc, $filename );
-	}
-
-	return true;
+    // If configuration file does not exist then rules also do not exist, so there is nothing to delete.
+    if ( ! file_exists( $filename ) ) {
+        return true;
+    }
+
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
+
+    $doc                     = new DOMDocument();
+    $doc->preserveWhiteSpace = false;
+
+    if ( $doc->load( $filename ) === false ) {
+        return false;
+    }
+
+    $xpath = new DOMXPath( $doc );
+    $rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+
+    if ( $rules->length > 0 ) {
+        $child  = $rules->item( 0 );
+        $parent = $child->parentNode;
+        $parent->removeChild( $child );
+        $doc->formatOutput = true;
+        saveDomDocument( $doc, $filename );
+    }
+
+    return true;
 }
 
 /**
@@ -882,82 +882,82 @@ 
  * @return bool
  */
 function iis7_add_rewrite_rule( $filename, $rewrite_rule ) {
-	if ( ! class_exists( 'DOMDocument', false ) ) {
-		return false;
-	}
-
-	// If configuration file does not exist then we create one.
-	if ( ! file_exists( $filename ) ) {
-		$fp = fopen( $filename, 'w' );
-		fwrite( $fp, '<configuration/>' );
-		fclose( $fp );
-	}
-
-	$doc                     = new DOMDocument();
-	$doc->preserveWhiteSpace = false;
-
-	if ( $doc->load( $filename ) === false ) {
-		return false;
-	}
-
-	$xpath = new DOMXPath( $doc );
-
-	// First check if the rule already exists as in that case there is no need to re-add it.
-	$wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
-
-	if ( $wordpress_rules->length > 0 ) {
-		return true;
-	}
-
-	// Check the XPath to the rewrite rule and create XML nodes if they do not exist.
-	$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
-
-	if ( $xml_nodes->length > 0 ) {
-		$rules_node = $xml_nodes->item( 0 );
-	} else {
-		$rules_node = $doc->createElement( 'rules' );
-
-		$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite' );
-
-		if ( $xml_nodes->length > 0 ) {
-			$rewrite_node = $xml_nodes->item( 0 );
-			$rewrite_node->appendChild( $rules_node );
-		} else {
-			$rewrite_node = $doc->createElement( 'rewrite' );
-			$rewrite_node->appendChild( $rules_node );
-
-			$xml_nodes = $xpath->query( '/configuration/system.webServer' );
-
-			if ( $xml_nodes->length > 0 ) {
-				$system_web_server_node = $xml_nodes->item( 0 );
-				$system_web_server_node->appendChild( $rewrite_node );
-			} else {
-				$system_web_server_node = $doc->createElement( 'system.webServer' );
-				$system_web_server_node->appendChild( $rewrite_node );
-
-				$xml_nodes = $xpath->query( '/configuration' );
-
-				if ( $xml_nodes->length > 0 ) {
-					$config_node = $xml_nodes->item( 0 );
-					$config_node->appendChild( $system_web_server_node );
-				} else {
-					$config_node = $doc->createElement( 'configuration' );
-					$doc->appendChild( $config_node );
-					$config_node->appendChild( $system_web_server_node );
-				}
-			}
-		}
-	}
-
-	$rule_fragment = $doc->createDocumentFragment();
-	$rule_fragment->appendXML( $rewrite_rule );
-	$rules_node->appendChild( $rule_fragment );
-
-	$doc->encoding     = 'UTF-8';
-	$doc->formatOutput = true;
-	saveDomDocument( $doc, $filename );
-
-	return true;
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
+
+    // If configuration file does not exist then we create one.
+    if ( ! file_exists( $filename ) ) {
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, '<configuration/>' );
+        fclose( $fp );
+    }
+
+    $doc                     = new DOMDocument();
+    $doc->preserveWhiteSpace = false;
+
+    if ( $doc->load( $filename ) === false ) {
+        return false;
+    }
+
+    $xpath = new DOMXPath( $doc );
+
+    // First check if the rule already exists as in that case there is no need to re-add it.
+    $wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+
+    if ( $wordpress_rules->length > 0 ) {
+        return true;
+    }
+
+    // Check the XPath to the rewrite rule and create XML nodes if they do not exist.
+    $xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
+
+    if ( $xml_nodes->length > 0 ) {
+        $rules_node = $xml_nodes->item( 0 );
+    } else {
+        $rules_node = $doc->createElement( 'rules' );
+
+        $xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite' );
+
+        if ( $xml_nodes->length > 0 ) {
+            $rewrite_node = $xml_nodes->item( 0 );
+            $rewrite_node->appendChild( $rules_node );
+        } else {
+            $rewrite_node = $doc->createElement( 'rewrite' );
+            $rewrite_node->appendChild( $rules_node );
+
+            $xml_nodes = $xpath->query( '/configuration/system.webServer' );
+
+            if ( $xml_nodes->length > 0 ) {
+                $system_web_server_node = $xml_nodes->item( 0 );
+                $system_web_server_node->appendChild( $rewrite_node );
+            } else {
+                $system_web_server_node = $doc->createElement( 'system.webServer' );
+                $system_web_server_node->appendChild( $rewrite_node );
+
+                $xml_nodes = $xpath->query( '/configuration' );
+
+                if ( $xml_nodes->length > 0 ) {
+                    $config_node = $xml_nodes->item( 0 );
+                    $config_node->appendChild( $system_web_server_node );
+                } else {
+                    $config_node = $doc->createElement( 'configuration' );
+                    $doc->appendChild( $config_node );
+                    $config_node->appendChild( $system_web_server_node );
+                }
+            }
+        }
+    }
+
+    $rule_fragment = $doc->createDocumentFragment();
+    $rule_fragment->appendXML( $rewrite_rule );
+    $rules_node->appendChild( $rule_fragment );
+
+    $doc->encoding     = 'UTF-8';
+    $doc->formatOutput = true;
+    saveDomDocument( $doc, $filename );
+
+    return true;
 }
 
 /**
@@ -969,12 +969,12 @@ 
  * @param string      $filename
  */
 function saveDomDocument( $doc, $filename ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	$config = $doc->saveXML();
-	$config = preg_replace( "/([^\r])\n/", "$1\r\n", $config );
+    $config = $doc->saveXML();
+    $config = preg_replace( "/([^\r])\n/", "$1\r\n", $config );
 
-	$fp = fopen( $filename, 'w' );
-	fwrite( $fp, $config );
-	fclose( $fp );
+    $fp = fopen( $filename, 'w' );
+    fwrite( $fp, $config );
+    fclose( $fp );
 }
 
 /**
@@ -987,37 +987,37 @@ 
  * @param int $user_id User ID.
  */
 function admin_color_scheme_picker( $user_id ) {
-	global $_wp_admin_css_colors;
-
-	ksort( $_wp_admin_css_colors );
-
-	if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
-		// Set Default ('fresh') and Light should go first.
-		$_wp_admin_css_colors = array_filter(
-			array_merge(
-				array(
-					'fresh'  => '',
-					'light'  => '',
-					'modern' => '',
-				),
-				$_wp_admin_css_colors
-			)
-		);
-	}
-
-	$current_color = get_user_option( 'admin_color', $user_id );
-
-	if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
-		$current_color = 'fresh';
-	}
-	?>
+    global $_wp_admin_css_colors;
+
+    ksort( $_wp_admin_css_colors );
+
+    if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
+        // Set Default ('fresh') and Light should go first.
+        $_wp_admin_css_colors = array_filter(
+            array_merge(
+                array(
+                    'fresh'  => '',
+                    'light'  => '',
+                    'modern' => '',
+                ),
+                $_wp_admin_css_colors
+            )
+        );
+    }
+
+    $current_color = get_user_option( 'admin_color', $user_id );
+
+    if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
+        $current_color = 'fresh';
+    }
+    ?>
 	<fieldset id="color-picker" class="scheme-list">
 		<legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
 		<?php
-		wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
-		foreach ( $_wp_admin_css_colors as $color => $color_info ) :
+        wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
+        foreach ( $_wp_admin_css_colors as $color => $color_info ) :
 
-			?>
+            ?>
 			<div class="color-option <?php echo ( $color === $current_color ) ? 'selected' : ''; ?>">
 				<input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
 				<input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
@@ -1026,19 +1026,19 @@ 
 				<table class="color-palette">
 					<tr>
 					<?php
-					foreach ( $color_info->colors as $html_color ) {
-						?>
+                    foreach ( $color_info->colors as $html_color ) {
+                        ?>
 						<td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
 						<?php
-					}
-					?>
+                    }
+                    ?>
 					</tr>
 				</table>
 			</div>
 			<?php
 
-		endforeach;
-		?>
+        endforeach;
+        ?>
 	</fieldset>
 	<?php
 }
@@ -1048,29 +1048,29 @@ 
  * @global array $_wp_admin_css_colors
  */
 function wp_color_scheme_settings() {
-	global $_wp_admin_css_colors;
-
-	$color_scheme = get_user_option( 'admin_color' );
-
-	// It's possible to have a color scheme set that is no longer registered.
-	if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
-		$color_scheme = 'fresh';
-	}
-
-	if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
-		$icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
-	} elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
-		$icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
-	} else {
-		// Fall back to the default set of icon colors if the default scheme is missing.
-		$icon_colors = array(
-			'base'    => '#a7aaad',
-			'focus'   => '#72aee6',
-			'current' => '#fff',
-		);
-	}
-
-	echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+    global $_wp_admin_css_colors;
+
+    $color_scheme = get_user_option( 'admin_color' );
+
+    // It's possible to have a color scheme set that is no longer registered.
+    if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+        $color_scheme = 'fresh';
+    }
+
+    if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
+        $icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
+    } elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
+        $icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
+    } else {
+        // Fall back to the default set of icon colors if the default scheme is missing.
+        $icon_colors = array(
+            'base'    => '#a7aaad',
+            'focus'   => '#72aee6',
+            'current' => '#fff',
+        );
+    }
+
+    echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
 }
 
 /**
@@ -1079,20 +1079,20 @@ 
  * @since 5.5.0
  */
 function wp_admin_viewport_meta() {
-	/**
-	 * Filters the viewport meta in the admin.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @param string $viewport_meta The viewport meta.
-	 */
-	$viewport_meta = apply_filters( 'admin_viewport_meta', 'width=device-width,initial-scale=1.0' );
-
-	if ( empty( $viewport_meta ) ) {
-		return;
-	}
-
-	echo '<meta name="viewport" content="' . esc_attr( $viewport_meta ) . '">';
+    /**
+     * Filters the viewport meta in the admin.
+     *
+     * @since 5.5.0
+     *
+     * @param string $viewport_meta The viewport meta.
+     */
+    $viewport_meta = apply_filters( 'admin_viewport_meta', 'width=device-width,initial-scale=1.0' );
+
+    if ( empty( $viewport_meta ) ) {
+        return;
+    }
+
+    echo '<meta name="viewport" content="' . esc_attr( $viewport_meta ) . '">';
 }
 
 /**
@@ -1106,7 +1106,7 @@ 
  * @return string Filtered viewport meta.
  */
 function _customizer_mobile_viewport_meta( $viewport_meta ) {
-	return trim( $viewport_meta, ',' ) . ',minimum-scale=0.5,maximum-scale=1.2';
+    return trim( $viewport_meta, ',' ) . ',minimum-scale=0.5,maximum-scale=1.2';
 }
 
 /**
@@ -1120,44 +1120,44 @@ 
  * @return array The Heartbeat response.
  */
 function wp_check_locked_posts( $response, $data, $screen_id ) {
-	$checked = array();
+    $checked = array();
 
-	if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
-		foreach ( $data['wp-check-locked-posts'] as $key ) {
-			$post_id = absint( substr( $key, 5 ) );
+    if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+        foreach ( $data['wp-check-locked-posts'] as $key ) {
+            $post_id = absint( substr( $key, 5 ) );
 
-			if ( ! $post_id ) {
-				continue;
-			}
+            if ( ! $post_id ) {
+                continue;
+            }
 
-			$user_id = wp_check_post_lock( $post_id );
+            $user_id = wp_check_post_lock( $post_id );
 
-			if ( $user_id ) {
-				$user = get_userdata( $user_id );
+            if ( $user_id ) {
+                $user = get_userdata( $user_id );
 
-				if ( $user && current_user_can( 'edit_post', $post_id ) ) {
-					$send = array(
-						'name' => $user->display_name,
-						/* translators: %s: User's display name. */
-						'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
-					);
+                if ( $user && current_user_can( 'edit_post', $post_id ) ) {
+                    $send = array(
+                        'name' => $user->display_name,
+                        /* translators: %s: User's display name. */
+                        'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
+                    );
 
-					if ( get_option( 'show_avatars' ) ) {
-						$send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
-						$send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
-					}
+                    if ( get_option( 'show_avatars' ) ) {
+                        $send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
+                        $send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
+                    }
 
-					$checked[ $key ] = $send;
-				}
-			}
-		}
-	}
+                    $checked[ $key ] = $send;
+                }
+            }
+        }
+    }
 
-	if ( ! empty( $checked ) ) {
-		$response['wp-check-locked-posts'] = $checked;
-	}
+    if ( ! empty( $checked ) ) {
+        $response['wp-check-locked-posts'] = $checked;
+    }
 
-	return $response;
+    return $response;
 }
 
 /**
@@ -1171,48 +1171,48 @@ 
  * @return array The Heartbeat response.
  */
 function wp_refresh_post_lock( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
-		$received = $data['wp-refresh-post-lock'];
-		$send     = array();
+    if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+        $received = $data['wp-refresh-post-lock'];
+        $send     = array();
 
-		$post_id = absint( $received['post_id'] );
+        $post_id = absint( $received['post_id'] );
 
-		if ( ! $post_id ) {
-			return $response;
-		}
+        if ( ! $post_id ) {
+            return $response;
+        }
 
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return $response;
-		}
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return $response;
+        }
 
-		$user_id = wp_check_post_lock( $post_id );
-		$user    = get_userdata( $user_id );
+        $user_id = wp_check_post_lock( $post_id );
+        $user    = get_userdata( $user_id );
 
-		if ( $user ) {
-			$error = array(
-				'name' => $user->display_name,
-				/* translators: %s: User's display name. */
-				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ),
-			);
+        if ( $user ) {
+            $error = array(
+                'name' => $user->display_name,
+                /* translators: %s: User's display name. */
+                'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ),
+            );
 
-			if ( get_option( 'show_avatars' ) ) {
-				$error['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 64 ) );
-				$error['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 128 ) );
-			}
+            if ( get_option( 'show_avatars' ) ) {
+                $error['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 64 ) );
+                $error['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 128 ) );
+            }
 
-			$send['lock_error'] = $error;
-		} else {
-			$new_lock = wp_set_post_lock( $post_id );
+            $send['lock_error'] = $error;
+        } else {
+            $new_lock = wp_set_post_lock( $post_id );
 
-			if ( $new_lock ) {
-				$send['new_lock'] = implode( ':', $new_lock );
-			}
-		}
+            if ( $new_lock ) {
+                $send['new_lock'] = implode( ':', $new_lock );
+            }
+        }
 
-		$response['wp-refresh-post-lock'] = $send;
-	}
+        $response['wp-refresh-post-lock'] = $send;
+    }
 
-	return $response;
+    return $response;
 }
 
 /**
@@ -1226,33 +1226,33 @@ 
  * @return array The Heartbeat response.
  */
 function wp_refresh_post_nonces( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
-		$received = $data['wp-refresh-post-nonces'];
+    if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+        $received = $data['wp-refresh-post-nonces'];
 
-		$response['wp-refresh-post-nonces'] = array( 'check' => 1 );
+        $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
 
-		$post_id = absint( $received['post_id'] );
+        $post_id = absint( $received['post_id'] );
 
-		if ( ! $post_id ) {
-			return $response;
-		}
+        if ( ! $post_id ) {
+            return $response;
+        }
 
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return $response;
-		}
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return $response;
+        }
 
-		$response['wp-refresh-post-nonces'] = array(
-			'replace' => array(
-				'getpermalinknonce'    => wp_create_nonce( 'getpermalink' ),
-				'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
-				'closedpostboxesnonce' => wp_create_nonce( 'closedpostboxes' ),
-				'_ajax_linking_nonce'  => wp_create_nonce( 'internal-linking' ),
-				'_wpnonce'             => wp_create_nonce( 'update-post_' . $post_id ),
-			),
-		);
-	}
-
-	return $response;
+        $response['wp-refresh-post-nonces'] = array(
+            'replace' => array(
+                'getpermalinknonce'    => wp_create_nonce( 'getpermalink' ),
+                'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
+                'closedpostboxesnonce' => wp_create_nonce( 'closedpostboxes' ),
+                '_ajax_linking_nonce'  => wp_create_nonce( 'internal-linking' ),
+                '_wpnonce'             => wp_create_nonce( 'update-post_' . $post_id ),
+            ),
+        );
+    }
+
+    return $response;
 }
 
 /**
@@ -1264,13 +1264,13 @@ 
  * @return array The Heartbeat response.
  */
 function wp_refresh_heartbeat_nonces( $response ) {
-	// Refresh the Rest API nonce.
-	$response['rest_nonce'] = wp_create_nonce( 'wp_rest' );
+    // Refresh the Rest API nonce.
+    $response['rest_nonce'] = wp_create_nonce( 'wp_rest' );
 
-	// Refresh the Heartbeat nonce.
-	$response['heartbeat_nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+    // Refresh the Heartbeat nonce.
+    $response['heartbeat_nonce'] = wp_create_nonce( 'heartbeat-nonce' );
 
-	return $response;
+    return $response;
 }
 
 /**
@@ -1284,13 +1284,13 @@ 
  * @return array Filtered Heartbeat settings.
  */
 function wp_heartbeat_set_suspension( $settings ) {
-	global $pagenow;
+    global $pagenow;
 
-	if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
-		$settings['suspension'] = 'disable';
-	}
+    if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
+        $settings['suspension'] = 'disable';
+    }
 
-	return $settings;
+    return $settings;
 }
 
 /**
@@ -1303,31 +1303,31 @@ 
  * @return array The Heartbeat response.
  */
 function heartbeat_autosave( $response, $data ) {
-	if ( ! empty( $data['wp_autosave'] ) ) {
-		$saved = wp_autosave( $data['wp_autosave'] );
-
-		if ( is_wp_error( $saved ) ) {
-			$response['wp_autosave'] = array(
-				'success' => false,
-				'message' => $saved->get_error_message(),
-			);
-		} elseif ( empty( $saved ) ) {
-			$response['wp_autosave'] = array(
-				'success' => false,
-				'message' => __( 'Error while saving.' ),
-			);
-		} else {
-			/* translators: Draft saved date format, see https://www.php.net/manual/datetime.format.php */
-			$draft_saved_date_format = __( 'g:i:s a' );
-			$response['wp_autosave'] = array(
-				'success' => true,
-				/* translators: %s: Date and time. */
-				'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ),
-			);
-		}
-	}
-
-	return $response;
+    if ( ! empty( $data['wp_autosave'] ) ) {
+        $saved = wp_autosave( $data['wp_autosave'] );
+
+        if ( is_wp_error( $saved ) ) {
+            $response['wp_autosave'] = array(
+                'success' => false,
+                'message' => $saved->get_error_message(),
+            );
+        } elseif ( empty( $saved ) ) {
+            $response['wp_autosave'] = array(
+                'success' => false,
+                'message' => __( 'Error while saving.' ),
+            );
+        } else {
+            /* translators: Draft saved date format, see https://www.php.net/manual/datetime.format.php */
+            $draft_saved_date_format = __( 'g:i:s a' );
+            $response['wp_autosave'] = array(
+                'success' => true,
+                /* translators: %s: Date and time. */
+                'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ),
+            );
+        }
+    }
+
+    return $response;
 }
 
 /**
@@ -1339,16 +1339,16 @@ 
  * @since 4.2.0
  */
 function wp_admin_canonical_url() {
-	$removable_query_args = wp_removable_query_args();
+    $removable_query_args = wp_removable_query_args();
 
-	if ( empty( $removable_query_args ) ) {
-		return;
-	}
+    if ( empty( $removable_query_args ) ) {
+        return;
+    }
 
-	// Ensure we're using an absolute URL.
-	$current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-	$filtered_url = remove_query_arg( $removable_query_args, $current_url );
-	?>
+    // Ensure we're using an absolute URL.
+    $current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+    $filtered_url = remove_query_arg( $removable_query_args, $current_url );
+    ?>
 	<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
 	<script>
 		if ( window.history.replaceState ) {
@@ -1364,21 +1364,21 @@ 
  * @since 4.9.0
  */
 function wp_admin_headers() {
-	$policy = 'strict-origin-when-cross-origin';
-
-	/**
-	 * Filters the admin referrer policy header value.
-	 *
-	 * @since 4.9.0
-	 * @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
-	 *
-	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
-	 *
-	 * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
-	 */
-	$policy = apply_filters( 'admin_referrer_policy', $policy );
-
-	header( sprintf( 'Referrer-Policy: %s', $policy ) );
+    $policy = 'strict-origin-when-cross-origin';
+
+    /**
+     * Filters the admin referrer policy header value.
+     *
+     * @since 4.9.0
+     * @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
+     *
+     * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
+     *
+     * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
+     */
+    $policy = apply_filters( 'admin_referrer_policy', $policy );
+
+    header( sprintf( 'Referrer-Policy: %s', $policy ) );
 }
 
 /**
@@ -1390,7 +1390,7 @@ 
  * @since 4.6.0
  */
 function wp_page_reload_on_back_button_js() {
-	?>
+    ?>
 	<script>
 		if ( typeof performance !== 'undefined' && performance.navigation && performance.navigation.type === 2 ) {
 			document.location.reload( true );
@@ -1411,22 +1411,22 @@ 
  * @param string $value     The proposed new site admin email address.
  */
 function update_option_new_admin_email( $old_value, $value ) {
-	if ( get_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
-		return;
-	}
+    if ( get_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
+        return;
+    }
 
-	$hash            = md5( $value . time() . wp_rand() );
-	$new_admin_email = array(
-		'hash'     => $hash,
-		'newemail' => $value,
-	);
-	update_option( 'adminhash', $new_admin_email );
+    $hash            = md5( $value . time() . wp_rand() );
+    $new_admin_email = array(
+        'hash'     => $hash,
+        'newemail' => $value,
+    );
+    update_option( 'adminhash', $new_admin_email );
 
-	$switched_locale = switch_to_locale( get_user_locale() );
+    $switched_locale = switch_to_locale( get_user_locale() );
 
-	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __(
-		'Howdy ###USERNAME###,
+    /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
+    $email_text = __(
+        'Howdy ###USERNAME###,
 
 Someone with administrator capabilities recently requested to have the
 administration email address changed on this site:
@@ -1443,57 +1443,57 @@ 
 Regards,
 All at ###SITENAME###
 ###SITEURL###'
-	);
-
-	/**
-	 * Filters the text of the email sent when a change of site admin email address is attempted.
-	 *
-	 * The following strings have a special meaning and will get replaced dynamically:
-	 * ###USERNAME###  The current user's username.
-	 * ###ADMIN_URL### The link to click on to confirm the email change.
-	 * ###EMAIL###     The proposed new site admin email address.
-	 * ###SITENAME###  The name of the site.
-	 * ###SITEURL###   The URL to the site.
-	 *
-	 * @since MU (3.0.0)
-	 * @since 4.9.0 This filter is no longer Multisite specific.
-	 *
-	 * @param string $email_text      Text in the email.
-	 * @param array  $new_admin_email {
-	 *     Data relating to the new site admin email address.
-	 *
-	 *     @type string $hash     The secure hash used in the confirmation link URL.
-	 *     @type string $newemail The proposed new site admin email address.
-	 * }
-	 */
-	$content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
-
-	$current_user = wp_get_current_user();
-	$content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content      = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
-	$content      = str_replace( '###EMAIL###', $value, $content );
-	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
-	$content      = str_replace( '###SITEURL###', home_url(), $content );
-
-	if ( '' !== get_option( 'blogname' ) ) {
-		$site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	} else {
-		$site_title = parse_url( home_url(), PHP_URL_HOST );
-	}
-
-	wp_mail(
-		$value,
-		sprintf(
-			/* translators: New admin email address notification email subject. %s: Site title. */
-			__( '[%s] New Admin Email Address' ),
-			$site_title
-		),
-		$content
-	);
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
+    );
+
+    /**
+     * Filters the text of the email sent when a change of site admin email address is attempted.
+     *
+     * The following strings have a special meaning and will get replaced dynamically:
+     * ###USERNAME###  The current user's username.
+     * ###ADMIN_URL### The link to click on to confirm the email change.
+     * ###EMAIL###     The proposed new site admin email address.
+     * ###SITENAME###  The name of the site.
+     * ###SITEURL###   The URL to the site.
+     *
+     * @since MU (3.0.0)
+     * @since 4.9.0 This filter is no longer Multisite specific.
+     *
+     * @param string $email_text      Text in the email.
+     * @param array  $new_admin_email {
+     *     Data relating to the new site admin email address.
+     *
+     *     @type string $hash     The secure hash used in the confirmation link URL.
+     *     @type string $newemail The proposed new site admin email address.
+     * }
+     */
+    $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
+
+    $current_user = wp_get_current_user();
+    $content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
+    $content      = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
+    $content      = str_replace( '###EMAIL###', $value, $content );
+    $content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
+    $content      = str_replace( '###SITEURL###', home_url(), $content );
+
+    if ( '' !== get_option( 'blogname' ) ) {
+        $site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    } else {
+        $site_title = parse_url( home_url(), PHP_URL_HOST );
+    }
+
+    wp_mail(
+        $value,
+        sprintf(
+            /* translators: New admin email address notification email subject. %s: Site title. */
+            __( '[%s] New Admin Email Address' ),
+            $site_title
+        ),
+        $content
+    );
+
+    if ( $switched_locale ) {
+        restore_previous_locale();
+    }
 }
 
 /**
@@ -1508,12 +1508,12 @@ 
  * @return string Page title.
  */
 function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) {
-	if ( 'draft' === $page->post_status && 'privacy' === get_current_screen()->id ) {
-		/* translators: %s: Page title. */
-		$title = sprintf( __( '%s (Draft)' ), $title );
-	}
+    if ( 'draft' === $page->post_status && 'privacy' === get_current_screen()->id ) {
+        /* translators: %s: Page title. */
+        $title = sprintf( __( '%s (Draft)' ), $title );
+    }
 
-	return $title;
+    return $title;
 }
 
 /**
@@ -1525,58 +1525,58 @@ 
  * @return array|false Array of PHP version data. False on failure.
  */
 function wp_check_php_version() {
-	$version = phpversion();
-	$key     = md5( $version );
-
-	$response = get_site_transient( 'php_check_' . $key );
-
-	if ( false === $response ) {
-		$url = 'http://api.wordpress.org/core/serve-happy/1.0/';
-
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
-		}
-
-		$url = add_query_arg( 'php_version', $version, $url );
-
-		$response = wp_remote_get( $url );
-
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-			return false;
-		}
-
-		/**
-		 * Response should be an array with:
-		 *  'recommended_version' - string - The PHP version recommended by WordPress.
-		 *  'is_supported' - boolean - Whether the PHP version is actively supported.
-		 *  'is_secure' - boolean - Whether the PHP version receives security updates.
-		 *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
-		 */
-		$response = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		if ( ! is_array( $response ) ) {
-			return false;
-		}
-
-		set_site_transient( 'php_check_' . $key, $response, WEEK_IN_SECONDS );
-	}
-
-	if ( isset( $response['is_acceptable'] ) && $response['is_acceptable'] ) {
-		/**
-		 * Filters whether the active PHP version is considered acceptable by WordPress.
-		 *
-		 * Returning false will trigger a PHP version warning to show up in the admin dashboard to administrators.
-		 *
-		 * This filter is only run if the wordpress.org Serve Happy API considers the PHP version acceptable, ensuring
-		 * that this filter can only make this check stricter, but not loosen it.
-		 *
-		 * @since 5.1.1
-		 *
-		 * @param bool   $is_acceptable Whether the PHP version is considered acceptable. Default true.
-		 * @param string $version       PHP version checked.
-		 */
-		$response['is_acceptable'] = (bool) apply_filters( 'wp_is_php_version_acceptable', true, $version );
-	}
-
-	return $response;
+    $version = phpversion();
+    $key     = md5( $version );
+
+    $response = get_site_transient( 'php_check_' . $key );
+
+    if ( false === $response ) {
+        $url = 'http://api.wordpress.org/core/serve-happy/1.0/';
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $url = add_query_arg( 'php_version', $version, $url );
+
+        $response = wp_remote_get( $url );
+
+        if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+            return false;
+        }
+
+        /**
+         * Response should be an array with:
+         *  'recommended_version' - string - The PHP version recommended by WordPress.
+         *  'is_supported' - boolean - Whether the PHP version is actively supported.
+         *  'is_secure' - boolean - Whether the PHP version receives security updates.
+         *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
+         */
+        $response = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        if ( ! is_array( $response ) ) {
+            return false;
+        }
+
+        set_site_transient( 'php_check_' . $key, $response, WEEK_IN_SECONDS );
+    }
+
+    if ( isset( $response['is_acceptable'] ) && $response['is_acceptable'] ) {
+        /**
+         * Filters whether the active PHP version is considered acceptable by WordPress.
+         *
+         * Returning false will trigger a PHP version warning to show up in the admin dashboard to administrators.
+         *
+         * This filter is only run if the wordpress.org Serve Happy API considers the PHP version acceptable, ensuring
+         * that this filter can only make this check stricter, but not loosen it.
+         *
+         * @since 5.1.1
+         *
+         * @param bool   $is_acceptable Whether the PHP version is considered acceptable. Default true.
+         * @param string $version       PHP version checked.
+         */
+        $response['is_acceptable'] = (bool) apply_filters( 'wp_is_php_version_acceptable', true, $version );
+    }
+
+    return $response;
 }

Spacing +360 added lines, -360 removed lines

@@ -14,7 +14,7 @@ 
  * @return bool Whether the server is running Apache with the mod_rewrite module loaded.
  */
 function got_mod_rewrite() {
-	$got_rewrite = apache_mod_loaded( 'mod_rewrite', true );
+	$got_rewrite = apache_mod_loaded('mod_rewrite', true);
 
 	/**
 	 * Filters whether Apache and mod_rewrite are present.
@@ -28,7 +28,7 @@ 
 	 *
 	 * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
 	 */
-	return apply_filters( 'got_rewrite', $got_rewrite );
+	return apply_filters('got_rewrite', $got_rewrite);
 }
 
 /**
@@ -43,7 +43,7 @@ 
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-	$got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+	$got_url_rewrite = (got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks());
 
 	/**
 	 * Filters whether URL rewriting is available.
@@ -52,7 +52,7 @@ 
 	 *
 	 * @param bool $got_url_rewrite Whether URL rewriting is available.
 	 */
-	return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+	return apply_filters('got_url_rewrite', $got_url_rewrite);
 }
 
 /**
@@ -64,31 +64,31 @@ 
  * @param string $marker   The marker to extract the strings from.
  * @return string[] An array of strings from a file (.htaccess) from between BEGIN and END markers.
  */
-function extract_from_markers( $filename, $marker ) {
+function extract_from_markers($filename, $marker) {
 	$result = array();
 
-	if ( ! file_exists( $filename ) ) {
+	if (!file_exists($filename)) {
 		return $result;
 	}
 
-	$markerdata = explode( "\n", implode( '', file( $filename ) ) );
+	$markerdata = explode("\n", implode('', file($filename)));
 
 	$state = false;
 
-	foreach ( $markerdata as $markerline ) {
-		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
+	foreach ($markerdata as $markerline) {
+		if (false !== strpos($markerline, '# END ' . $marker)) {
 			$state = false;
 		}
 
-		if ( $state ) {
-			if ( '#' === substr( $markerline, 0, 1 ) ) {
+		if ($state) {
+			if ('#' === substr($markerline, 0, 1)) {
 				continue;
 			}
 
 			$result[] = $markerline;
 		}
 
-		if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+		if (false !== strpos($markerline, '# BEGIN ' . $marker)) {
 			$state = true;
 		}
 	}
@@ -110,31 +110,31 @@ 
  * @param array|string $insertion The new content to insert.
  * @return bool True on write success, false on failure.
  */
-function insert_with_markers( $filename, $marker, $insertion ) {
-	if ( ! file_exists( $filename ) ) {
-		if ( ! is_writable( dirname( $filename ) ) ) {
+function insert_with_markers($filename, $marker, $insertion) {
+	if (!file_exists($filename)) {
+		if (!is_writable(dirname($filename))) {
 			return false;
 		}
 
-		if ( ! touch( $filename ) ) {
+		if (!touch($filename)) {
 			return false;
 		}
 
 		// Make sure the file is created with a minimum set of permissions.
-		$perms = fileperms( $filename );
+		$perms = fileperms($filename);
 
-		if ( $perms ) {
-			chmod( $filename, $perms | 0644 );
+		if ($perms) {
+			chmod($filename, $perms | 0644);
 		}
-	} elseif ( ! is_writable( $filename ) ) {
+	} elseif (!is_writable($filename)) {
 		return false;
 	}
 
-	if ( ! is_array( $insertion ) ) {
-		$insertion = explode( "\n", $insertion );
+	if (!is_array($insertion)) {
+		$insertion = explode("\n", $insertion);
 	}
 
-	$switched_locale = switch_to_locale( get_locale() );
+	$switched_locale = switch_to_locale(get_locale());
 
 	$instructions = sprintf(
 		/* translators: 1: Marker. */
@@ -146,10 +146,10 @@ 
 		$marker
 	);
 
-	$instructions = explode( "\n", $instructions );
+	$instructions = explode("\n", $instructions);
 
-	foreach ( $instructions as $line => $text ) {
-		$instructions[ $line ] = '# ' . $text;
+	foreach ($instructions as $line => $text) {
+		$instructions[$line] = '# ' . $text;
 	}
 
 	/**
@@ -160,30 +160,30 @@ 
 	 * @param string[] $instructions Array of lines with inline instructions.
 	 * @param string   $marker       The marker being inserted.
 	 */
-	$instructions = apply_filters( 'insert_with_markers_inline_instructions', $instructions, $marker );
+	$instructions = apply_filters('insert_with_markers_inline_instructions', $instructions, $marker);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
-	$insertion = array_merge( $instructions, $insertion );
+	$insertion = array_merge($instructions, $insertion);
 
 	$start_marker = "# BEGIN {$marker}";
 	$end_marker   = "# END {$marker}";
 
-	$fp = fopen( $filename, 'r+' );
+	$fp = fopen($filename, 'r+');
 
-	if ( ! $fp ) {
+	if (!$fp) {
 		return false;
 	}
 
 	// Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
-	flock( $fp, LOCK_EX );
+	flock($fp, LOCK_EX);
 
 	$lines = array();
 
-	while ( ! feof( $fp ) ) {
-		$lines[] = rtrim( fgets( $fp ), "\r\n" );
+	while (!feof($fp)) {
+		$lines[] = rtrim(fgets($fp), "\r\n");
 	}
 
 	// Split out the existing file into the preceding lines, and those that appear after the marker.
@@ -193,18 +193,18 @@ 
 	$found_marker     = false;
 	$found_end_marker = false;
 
-	foreach ( $lines as $line ) {
-		if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+	foreach ($lines as $line) {
+		if (!$found_marker && false !== strpos($line, $start_marker)) {
 			$found_marker = true;
 			continue;
-		} elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+		} elseif (!$found_end_marker && false !== strpos($line, $end_marker)) {
 			$found_end_marker = true;
 			continue;
 		}
 
-		if ( ! $found_marker ) {
+		if (!$found_marker) {
 			$pre_lines[] = $line;
-		} elseif ( $found_marker && $found_end_marker ) {
+		} elseif ($found_marker && $found_end_marker) {
 			$post_lines[] = $line;
 		} else {
 			$existing_lines[] = $line;
@@ -212,9 +212,9 @@ 
 	}
 
 	// Check to see if there was a change.
-	if ( $existing_lines === $insertion ) {
-		flock( $fp, LOCK_UN );
-		fclose( $fp );
+	if ($existing_lines === $insertion) {
+		flock($fp, LOCK_UN);
+		fclose($fp);
 
 		return true;
 	}
@@ -224,24 +224,24 @@ 
 		"\n",
 		array_merge(
 			$pre_lines,
-			array( $start_marker ),
+			array($start_marker),
 			$insertion,
-			array( $end_marker ),
+			array($end_marker),
 			$post_lines
 		)
 	);
 
 	// Write to the start of the file, and truncate it to that length.
-	fseek( $fp, 0 );
-	$bytes = fwrite( $fp, $new_file_data );
+	fseek($fp, 0);
+	$bytes = fwrite($fp, $new_file_data);
 
-	if ( $bytes ) {
-		ftruncate( $fp, ftell( $fp ) );
+	if ($bytes) {
+		ftruncate($fp, ftell($fp));
 	}
 
-	fflush( $fp );
-	flock( $fp, LOCK_UN );
-	fclose( $fp );
+	fflush($fp);
+	flock($fp, LOCK_UN);
+	fclose($fp);
 
 	return (bool) $bytes;
 }
@@ -261,7 +261,7 @@ 
 function save_mod_rewrite_rules() {
 	global $wp_rewrite;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		return;
 	}
 
@@ -275,13 +275,13 @@ 
 	 * If the file doesn't already exist check for write access to the directory
 	 * and whether we have some rules. Else check for write access to the file.
 	 */
-	if ( ! file_exists( $htaccess_file ) && is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
-		|| is_writable( $htaccess_file )
+	if (!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()
+		|| is_writable($htaccess_file)
 	) {
-		if ( got_mod_rewrite() ) {
-			$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
+		if (got_mod_rewrite()) {
+			$rules = explode("\n", $wp_rewrite->mod_rewrite_rules());
 
-			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
+			return insert_with_markers($htaccess_file, 'WordPress', $rules);
 		}
 	}
 
@@ -301,7 +301,7 @@ 
 function iis7_save_url_rewrite_rules() {
 	global $wp_rewrite;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		return;
 	}
 
@@ -312,16 +312,16 @@ 
 	$web_config_file = $home_path . 'web.config';
 
 	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP.
-	if ( iis7_supports_permalinks()
-		&& ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks()
-			|| win_is_writable( $web_config_file ) )
+	if (iis7_supports_permalinks()
+		&& (!file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()
+			|| win_is_writable($web_config_file))
 	) {
-		$rule = $wp_rewrite->iis7_url_rewrite_rules( false );
+		$rule = $wp_rewrite->iis7_url_rewrite_rules(false);
 
-		if ( ! empty( $rule ) ) {
-			return iis7_add_rewrite_rule( $web_config_file, $rule );
+		if (!empty($rule)) {
+			return iis7_add_rewrite_rule($web_config_file, $rule);
 		} else {
-			return iis7_delete_rewrite_rule( $web_config_file );
+			return iis7_delete_rewrite_rule($web_config_file);
 		}
 	}
 
@@ -335,23 +335,23 @@ 
  *
  * @param string $file
  */
-function update_recently_edited( $file ) {
-	$oldfiles = (array) get_option( 'recently_edited' );
+function update_recently_edited($file) {
+	$oldfiles = (array) get_option('recently_edited');
 
-	if ( $oldfiles ) {
-		$oldfiles   = array_reverse( $oldfiles );
+	if ($oldfiles) {
+		$oldfiles   = array_reverse($oldfiles);
 		$oldfiles[] = $file;
-		$oldfiles   = array_reverse( $oldfiles );
-		$oldfiles   = array_unique( $oldfiles );
+		$oldfiles   = array_reverse($oldfiles);
+		$oldfiles   = array_unique($oldfiles);
 
-		if ( 5 < count( $oldfiles ) ) {
-			array_pop( $oldfiles );
+		if (5 < count($oldfiles)) {
+			array_pop($oldfiles);
 		}
 	} else {
 		$oldfiles[] = $file;
 	}
 
-	update_option( 'recently_edited', $oldfiles );
+	update_option('recently_edited', $oldfiles);
 }
 
 /**
@@ -363,15 +363,15 @@ 
  * @param array $allowed_files List of theme file paths.
  * @return array Tree structure for listing theme files.
  */
-function wp_make_theme_file_tree( $allowed_files ) {
+function wp_make_theme_file_tree($allowed_files) {
 	$tree_list = array();
 
-	foreach ( $allowed_files as $file_name => $absolute_filename ) {
-		$list     = explode( '/', $file_name );
+	foreach ($allowed_files as $file_name => $absolute_filename) {
+		$list     = explode('/', $file_name);
 		$last_dir = &$tree_list;
 
-		foreach ( $list as $dir ) {
-			$last_dir =& $last_dir[ $dir ];
+		foreach ($list as $dir) {
+			$last_dir = & $last_dir[$dir];
 		}
 
 		$last_dir = $file_name;
@@ -395,27 +395,27 @@ 
  * @param int          $size  The aria-setsize for the current iteration.
  * @param int          $index The aria-posinset for the current iteration.
  */
-function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
+function wp_print_theme_file_tree($tree, $level = 2, $size = 1, $index = 1) {
 	global $relative_file, $stylesheet;
 
-	if ( is_array( $tree ) ) {
+	if (is_array($tree)) {
 		$index = 0;
-		$size  = count( $tree );
+		$size  = count($tree);
 
-		foreach ( $tree as $label => $theme_file ) :
+		foreach ($tree as $label => $theme_file) :
 			$index++;
 
-			if ( ! is_array( $theme_file ) ) {
-				wp_print_theme_file_tree( $theme_file, $level, $index, $size );
+			if (!is_array($theme_file)) {
+				wp_print_theme_file_tree($theme_file, $level, $index, $size);
 				continue;
 			}
 			?>
 			<li role="treeitem" aria-expanded="true" tabindex="-1"
-				aria-level="<?php echo esc_attr( $level ); ?>"
-				aria-setsize="<?php echo esc_attr( $size ); ?>"
-				aria-posinset="<?php echo esc_attr( $index ); ?>">
-				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text"><?php _e( 'folder' ); ?></span><span aria-hidden="true" class="icon"></span></span>
-				<ul role="group" class="tree-folder"><?php wp_print_theme_file_tree( $theme_file, $level + 1, $index, $size ); ?></ul>
+				aria-level="<?php echo esc_attr($level); ?>"
+				aria-setsize="<?php echo esc_attr($size); ?>"
+				aria-posinset="<?php echo esc_attr($index); ?>">
+				<span class="folder-label"><?php echo esc_html($label); ?> <span class="screen-reader-text"><?php _e('folder'); ?></span><span aria-hidden="true" class="icon"></span></span>
+				<ul role="group" class="tree-folder"><?php wp_print_theme_file_tree($theme_file, $level + 1, $index, $size); ?></ul>
 			</li>
 			<?php
 		endforeach;
@@ -423,26 +423,26 @@ 
 		$filename = $tree;
 		$url      = add_query_arg(
 			array(
-				'file'  => rawurlencode( $tree ),
-				'theme' => rawurlencode( $stylesheet ),
+				'file'  => rawurlencode($tree),
+				'theme' => rawurlencode($stylesheet),
 			),
-			self_admin_url( 'theme-editor.php' )
+			self_admin_url('theme-editor.php')
 		);
 		?>
-		<li role="none" class="<?php echo esc_attr( $relative_file === $filename ? 'current-file' : '' ); ?>">
-			<a role="treeitem" tabindex="<?php echo esc_attr( $relative_file === $filename ? '0' : '-1' ); ?>"
-				href="<?php echo esc_url( $url ); ?>"
-				aria-level="<?php echo esc_attr( $level ); ?>"
-				aria-setsize="<?php echo esc_attr( $size ); ?>"
-				aria-posinset="<?php echo esc_attr( $index ); ?>">
+		<li role="none" class="<?php echo esc_attr($relative_file === $filename ? 'current-file' : ''); ?>">
+			<a role="treeitem" tabindex="<?php echo esc_attr($relative_file === $filename ? '0' : '-1'); ?>"
+				href="<?php echo esc_url($url); ?>"
+				aria-level="<?php echo esc_attr($level); ?>"
+				aria-setsize="<?php echo esc_attr($size); ?>"
+				aria-posinset="<?php echo esc_attr($index); ?>">
 				<?php
-				$file_description = esc_html( get_file_description( $filename ) );
+				$file_description = esc_html(get_file_description($filename));
 
-				if ( $file_description !== $filename && wp_basename( $filename ) !== $file_description ) {
-					$file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
+				if ($file_description !== $filename && wp_basename($filename) !== $file_description) {
+					$file_description .= '<br /><span class="nonessential">(' . esc_html($filename) . ')</span>';
 				}
 
-				if ( $relative_file === $filename ) {
+				if ($relative_file === $filename) {
 					echo '<span class="notice notice-info">' . $file_description . '</span>';
 				} else {
 					echo $file_description;
@@ -463,15 +463,15 @@ 
  * @param array $plugin_editable_files List of plugin file paths.
  * @return array Tree structure for listing plugin files.
  */
-function wp_make_plugin_file_tree( $plugin_editable_files ) {
+function wp_make_plugin_file_tree($plugin_editable_files) {
 	$tree_list = array();
 
-	foreach ( $plugin_editable_files as $plugin_file ) {
-		$list     = explode( '/', preg_replace( '#^.+?/#', '', $plugin_file ) );
+	foreach ($plugin_editable_files as $plugin_file) {
+		$list     = explode('/', preg_replace('#^.+?/#', '', $plugin_file));
 		$last_dir = &$tree_list;
 
-		foreach ( $list as $dir ) {
-			$last_dir =& $last_dir[ $dir ];
+		foreach ($list as $dir) {
+			$last_dir = & $last_dir[$dir];
 		}
 
 		$last_dir = $plugin_file;
@@ -492,50 +492,50 @@ 
  * @param int          $size  The aria-setsize for the current iteration.
  * @param int          $index The aria-posinset for the current iteration.
  */
-function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $index = 1 ) {
+function wp_print_plugin_file_tree($tree, $label = '', $level = 2, $size = 1, $index = 1) {
 	global $file, $plugin;
 
-	if ( is_array( $tree ) ) {
+	if (is_array($tree)) {
 		$index = 0;
-		$size  = count( $tree );
+		$size  = count($tree);
 
-		foreach ( $tree as $label => $plugin_file ) :
+		foreach ($tree as $label => $plugin_file) :
 			$index++;
 
-			if ( ! is_array( $plugin_file ) ) {
-				wp_print_plugin_file_tree( $plugin_file, $label, $level, $index, $size );
+			if (!is_array($plugin_file)) {
+				wp_print_plugin_file_tree($plugin_file, $label, $level, $index, $size);
 				continue;
 			}
 			?>
 			<li role="treeitem" aria-expanded="true" tabindex="-1"
-				aria-level="<?php echo esc_attr( $level ); ?>"
-				aria-setsize="<?php echo esc_attr( $size ); ?>"
-				aria-posinset="<?php echo esc_attr( $index ); ?>">
-				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text"><?php _e( 'folder' ); ?></span><span aria-hidden="true" class="icon"></span></span>
-				<ul role="group" class="tree-folder"><?php wp_print_plugin_file_tree( $plugin_file, '', $level + 1, $index, $size ); ?></ul>
+				aria-level="<?php echo esc_attr($level); ?>"
+				aria-setsize="<?php echo esc_attr($size); ?>"
+				aria-posinset="<?php echo esc_attr($index); ?>">
+				<span class="folder-label"><?php echo esc_html($label); ?> <span class="screen-reader-text"><?php _e('folder'); ?></span><span aria-hidden="true" class="icon"></span></span>
+				<ul role="group" class="tree-folder"><?php wp_print_plugin_file_tree($plugin_file, '', $level + 1, $index, $size); ?></ul>
 			</li>
 			<?php
 		endforeach;
 	} else {
 		$url = add_query_arg(
 			array(
-				'file'   => rawurlencode( $tree ),
-				'plugin' => rawurlencode( $plugin ),
+				'file'   => rawurlencode($tree),
+				'plugin' => rawurlencode($plugin),
 			),
-			self_admin_url( 'plugin-editor.php' )
+			self_admin_url('plugin-editor.php')
 		);
 		?>
-		<li role="none" class="<?php echo esc_attr( $file === $tree ? 'current-file' : '' ); ?>">
-			<a role="treeitem" tabindex="<?php echo esc_attr( $file === $tree ? '0' : '-1' ); ?>"
-				href="<?php echo esc_url( $url ); ?>"
-				aria-level="<?php echo esc_attr( $level ); ?>"
-				aria-setsize="<?php echo esc_attr( $size ); ?>"
-				aria-posinset="<?php echo esc_attr( $index ); ?>">
+		<li role="none" class="<?php echo esc_attr($file === $tree ? 'current-file' : ''); ?>">
+			<a role="treeitem" tabindex="<?php echo esc_attr($file === $tree ? '0' : '-1'); ?>"
+				href="<?php echo esc_url($url); ?>"
+				aria-level="<?php echo esc_attr($level); ?>"
+				aria-setsize="<?php echo esc_attr($size); ?>"
+				aria-posinset="<?php echo esc_attr($index); ?>">
 				<?php
-				if ( $file === $tree ) {
-					echo '<span class="notice notice-info">' . esc_html( $label ) . '</span>';
+				if ($file === $tree) {
+					echo '<span class="notice notice-info">' . esc_html($label) . '</span>';
 				} else {
-					echo esc_html( $label );
+					echo esc_html($label);
 				}
 				?>
 			</a>
@@ -552,13 +552,13 @@ 
  * @param string $old_value
  * @param string $value
  */
-function update_home_siteurl( $old_value, $value ) {
-	if ( wp_installing() ) {
+function update_home_siteurl($old_value, $value) {
+	if (wp_installing()) {
 		return;
 	}
 
-	if ( is_multisite() && ms_is_switched() ) {
-		delete_option( 'rewrite_rules' );
+	if (is_multisite() && ms_is_switched()) {
+		delete_option('rewrite_rules');
 	} else {
 		flush_rewrite_rules();
 	}
@@ -576,16 +576,16 @@ 
  *
  * @param array $vars An array of globals to reset.
  */
-function wp_reset_vars( $vars ) {
-	foreach ( $vars as $var ) {
-		if ( empty( $_POST[ $var ] ) ) {
-			if ( empty( $_GET[ $var ] ) ) {
-				$GLOBALS[ $var ] = '';
+function wp_reset_vars($vars) {
+	foreach ($vars as $var) {
+		if (empty($_POST[$var])) {
+			if (empty($_GET[$var])) {
+				$GLOBALS[$var] = '';
 			} else {
-				$GLOBALS[ $var ] = $_GET[ $var ];
+				$GLOBALS[$var] = $_GET[$var];
 			}
 		} else {
-			$GLOBALS[ $var ] = $_POST[ $var ];
+			$GLOBALS[$var] = $_POST[$var];
 		}
 	}
 }
@@ -597,9 +597,9 @@ 
  *
  * @param string|WP_Error $message
  */
-function show_message( $message ) {
-	if ( is_wp_error( $message ) ) {
-		if ( $message->get_error_data() && is_string( $message->get_error_data() ) ) {
+function show_message($message) {
+	if (is_wp_error($message)) {
+		if ($message->get_error_data() && is_string($message->get_error_data())) {
 			$message = $message->get_error_message() . ': ' . $message->get_error_data();
 		} else {
 			$message = $message->get_error_message();
@@ -617,40 +617,40 @@ 
  * @param string $content
  * @return array
  */
-function wp_doc_link_parse( $content ) {
-	if ( ! is_string( $content ) || empty( $content ) ) {
+function wp_doc_link_parse($content) {
+	if (!is_string($content) || empty($content)) {
 		return array();
 	}
 
-	if ( ! function_exists( 'token_get_all' ) ) {
+	if (!function_exists('token_get_all')) {
 		return array();
 	}
 
-	$tokens           = token_get_all( $content );
-	$count            = count( $tokens );
+	$tokens           = token_get_all($content);
+	$count            = count($tokens);
 	$functions        = array();
 	$ignore_functions = array();
 
-	for ( $t = 0; $t < $count - 2; $t++ ) {
-		if ( ! is_array( $tokens[ $t ] ) ) {
+	for ($t = 0; $t < $count - 2; $t++) {
+		if (!is_array($tokens[$t])) {
 			continue;
 		}
 
-		if ( T_STRING === $tokens[ $t ][0] && ( '(' === $tokens[ $t + 1 ] || '(' === $tokens[ $t + 2 ] ) ) {
+		if (T_STRING === $tokens[$t][0] && ('(' === $tokens[$t + 1] || '(' === $tokens[$t + 2])) {
 			// If it's a function or class defined locally, there's not going to be any docs available.
-			if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ), true ) )
-				|| ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR === $tokens[ $t - 1 ][0] )
+			if ((isset($tokens[$t - 2][1]) && in_array($tokens[$t - 2][1], array('function', 'class'), true))
+				|| (isset($tokens[$t - 2][0]) && T_OBJECT_OPERATOR === $tokens[$t - 1][0])
 			) {
-				$ignore_functions[] = $tokens[ $t ][1];
+				$ignore_functions[] = $tokens[$t][1];
 			}
 
 			// Add this to our stack of unique references.
-			$functions[] = $tokens[ $t ][1];
+			$functions[] = $tokens[$t][1];
 		}
 	}
 
-	$functions = array_unique( $functions );
-	sort( $functions );
+	$functions = array_unique($functions);
+	sort($functions);
 
 	/**
 	 * Filters the list of functions and classes to be ignored from the documentation lookup.
@@ -659,14 +659,14 @@ 
 	 *
 	 * @param string[] $ignore_functions Array of names of functions and classes to be ignored.
 	 */
-	$ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
+	$ignore_functions = apply_filters('documentation_ignore_functions', $ignore_functions);
 
-	$ignore_functions = array_unique( $ignore_functions );
+	$ignore_functions = array_unique($ignore_functions);
 
 	$out = array();
 
-	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions, true ) ) {
+	foreach ($functions as $function) {
+		if (in_array($function, $ignore_functions, true)) {
 			continue;
 		}
 
@@ -682,38 +682,38 @@ 
  * @since 2.8.0
  */
 function set_screen_options() {
-	if ( ! isset( $_POST['wp_screen_options'] ) || ! is_array( $_POST['wp_screen_options'] ) ) {
+	if (!isset($_POST['wp_screen_options']) || !is_array($_POST['wp_screen_options'])) {
 		return;
 	}
 
-	check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+	check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
 	$user = wp_get_current_user();
 
-	if ( ! $user ) {
+	if (!$user) {
 		return;
 	}
 
 	$option = $_POST['wp_screen_options']['option'];
 	$value  = $_POST['wp_screen_options']['value'];
 
-	if ( sanitize_key( $option ) !== $option ) {
+	if (sanitize_key($option) !== $option) {
 		return;
 	}
 
 	$map_option = $option;
-	$type       = str_replace( 'edit_', '', $map_option );
-	$type       = str_replace( '_per_page', '', $type );
+	$type       = str_replace('edit_', '', $map_option);
+	$type       = str_replace('_per_page', '', $type);
 
-	if ( in_array( $type, get_taxonomies(), true ) ) {
+	if (in_array($type, get_taxonomies(), true)) {
 		$map_option = 'edit_tags_per_page';
-	} elseif ( in_array( $type, get_post_types(), true ) ) {
+	} elseif (in_array($type, get_post_types(), true)) {
 		$map_option = 'edit_per_page';
 	} else {
-		$option = str_replace( '-', '_', $option );
+		$option = str_replace('-', '_', $option);
 	}
 
-	switch ( $map_option ) {
+	switch ($map_option) {
 		case 'edit_per_page':
 		case 'users_per_page':
 		case 'edit_comments_per_page':
@@ -731,7 +731,7 @@ 
 		case 'site_themes_network_per_page':
 			$value = (int) $value;
 
-			if ( $value < 1 || $value > 999 ) {
+			if ($value < 1 || $value > 999) {
 				return;
 			}
 
@@ -740,7 +740,7 @@ 
 		default:
 			$screen_option = false;
 
-			if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+			if ('_page' === substr($option, -5) || 'layout_columns' === $option) {
 				/**
 				 * Filters a screen option value before it is set.
 				 *
@@ -760,7 +760,7 @@ 
 				 * @param string $option        The option name.
 				 * @param int    $value         The option value.
 				 */
-				$screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+				$screen_option = apply_filters('set-screen-option', $screen_option, $option, $value); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 			}
 
 			/**
@@ -779,24 +779,24 @@ 
 			 * @param string  $option        The option name.
 			 * @param int     $value         The option value.
 			 */
-			$value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
+			$value = apply_filters("set_screen_option_{$option}", $screen_option, $option, $value);
 
-			if ( false === $value ) {
+			if (false === $value) {
 				return;
 			}
 
 			break;
 	}
 
-	update_user_meta( $user->ID, $option, $value );
+	update_user_meta($user->ID, $option, $value);
 
-	$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
+	$url = remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer());
 
-	if ( isset( $_POST['mode'] ) ) {
-		$url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+	if (isset($_POST['mode'])) {
+		$url = add_query_arg(array('mode' => $_POST['mode']), $url);
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect($url);
 	exit;
 }
 
@@ -808,25 +808,25 @@ 
  * @param string $filename The file path to the configuration file.
  * @return bool
  */
-function iis7_rewrite_rule_exists( $filename ) {
-	if ( ! file_exists( $filename ) ) {
+function iis7_rewrite_rule_exists($filename) {
+	if (!file_exists($filename)) {
 		return false;
 	}
 
-	if ( ! class_exists( 'DOMDocument', false ) ) {
+	if (!class_exists('DOMDocument', false)) {
 		return false;
 	}
 
 	$doc = new DOMDocument();
 
-	if ( $doc->load( $filename ) === false ) {
+	if ($doc->load($filename) === false) {
 		return false;
 	}
 
-	$xpath = new DOMXPath( $doc );
-	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+	$xpath = new DOMXPath($doc);
+	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
 
-	if ( 0 === $rules->length ) {
+	if (0 === $rules->length) {
 		return false;
 	}
 
@@ -841,32 +841,32 @@ 
  * @param string $filename Name of the configuration file.
  * @return bool
  */
-function iis7_delete_rewrite_rule( $filename ) {
+function iis7_delete_rewrite_rule($filename) {
 	// If configuration file does not exist then rules also do not exist, so there is nothing to delete.
-	if ( ! file_exists( $filename ) ) {
+	if (!file_exists($filename)) {
 		return true;
 	}
 
-	if ( ! class_exists( 'DOMDocument', false ) ) {
+	if (!class_exists('DOMDocument', false)) {
 		return false;
 	}
 
 	$doc                     = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc->load( $filename ) === false ) {
+	if ($doc->load($filename) === false) {
 		return false;
 	}
 
-	$xpath = new DOMXPath( $doc );
-	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+	$xpath = new DOMXPath($doc);
+	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
 
-	if ( $rules->length > 0 ) {
-		$child  = $rules->item( 0 );
+	if ($rules->length > 0) {
+		$child  = $rules->item(0);
 		$parent = $child->parentNode;
-		$parent->removeChild( $child );
+		$parent->removeChild($child);
 		$doc->formatOutput = true;
-		saveDomDocument( $doc, $filename );
+		saveDomDocument($doc, $filename);
 	}
 
 	return true;
@@ -881,81 +881,81 @@ 
  * @param string $rewrite_rule The XML fragment with URL Rewrite rule.
  * @return bool
  */
-function iis7_add_rewrite_rule( $filename, $rewrite_rule ) {
-	if ( ! class_exists( 'DOMDocument', false ) ) {
+function iis7_add_rewrite_rule($filename, $rewrite_rule) {
+	if (!class_exists('DOMDocument', false)) {
 		return false;
 	}
 
 	// If configuration file does not exist then we create one.
-	if ( ! file_exists( $filename ) ) {
-		$fp = fopen( $filename, 'w' );
-		fwrite( $fp, '<configuration/>' );
-		fclose( $fp );
+	if (!file_exists($filename)) {
+		$fp = fopen($filename, 'w');
+		fwrite($fp, '<configuration/>');
+		fclose($fp);
 	}
 
 	$doc                     = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc->load( $filename ) === false ) {
+	if ($doc->load($filename) === false) {
 		return false;
 	}
 
-	$xpath = new DOMXPath( $doc );
+	$xpath = new DOMXPath($doc);
 
 	// First check if the rule already exists as in that case there is no need to re-add it.
-	$wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
 
-	if ( $wordpress_rules->length > 0 ) {
+	if ($wordpress_rules->length > 0) {
 		return true;
 	}
 
 	// Check the XPath to the rewrite rule and create XML nodes if they do not exist.
-	$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
+	$xml_nodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
 
-	if ( $xml_nodes->length > 0 ) {
-		$rules_node = $xml_nodes->item( 0 );
+	if ($xml_nodes->length > 0) {
+		$rules_node = $xml_nodes->item(0);
 	} else {
-		$rules_node = $doc->createElement( 'rules' );
+		$rules_node = $doc->createElement('rules');
 
-		$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite' );
+		$xml_nodes = $xpath->query('/configuration/system.webServer/rewrite');
 
-		if ( $xml_nodes->length > 0 ) {
-			$rewrite_node = $xml_nodes->item( 0 );
-			$rewrite_node->appendChild( $rules_node );
+		if ($xml_nodes->length > 0) {
+			$rewrite_node = $xml_nodes->item(0);
+			$rewrite_node->appendChild($rules_node);
 		} else {
-			$rewrite_node = $doc->createElement( 'rewrite' );
-			$rewrite_node->appendChild( $rules_node );
+			$rewrite_node = $doc->createElement('rewrite');
+			$rewrite_node->appendChild($rules_node);
 
-			$xml_nodes = $xpath->query( '/configuration/system.webServer' );
+			$xml_nodes = $xpath->query('/configuration/system.webServer');
 
-			if ( $xml_nodes->length > 0 ) {
-				$system_web_server_node = $xml_nodes->item( 0 );
-				$system_web_server_node->appendChild( $rewrite_node );
+			if ($xml_nodes->length > 0) {
+				$system_web_server_node = $xml_nodes->item(0);
+				$system_web_server_node->appendChild($rewrite_node);
 			} else {
-				$system_web_server_node = $doc->createElement( 'system.webServer' );
-				$system_web_server_node->appendChild( $rewrite_node );
+				$system_web_server_node = $doc->createElement('system.webServer');
+				$system_web_server_node->appendChild($rewrite_node);
 
-				$xml_nodes = $xpath->query( '/configuration' );
+				$xml_nodes = $xpath->query('/configuration');
 
-				if ( $xml_nodes->length > 0 ) {
-					$config_node = $xml_nodes->item( 0 );
-					$config_node->appendChild( $system_web_server_node );
+				if ($xml_nodes->length > 0) {
+					$config_node = $xml_nodes->item(0);
+					$config_node->appendChild($system_web_server_node);
 				} else {
-					$config_node = $doc->createElement( 'configuration' );
-					$doc->appendChild( $config_node );
-					$config_node->appendChild( $system_web_server_node );
+					$config_node = $doc->createElement('configuration');
+					$doc->appendChild($config_node);
+					$config_node->appendChild($system_web_server_node);
 				}
 			}
 		}
 	}
 
 	$rule_fragment = $doc->createDocumentFragment();
-	$rule_fragment->appendXML( $rewrite_rule );
-	$rules_node->appendChild( $rule_fragment );
+	$rule_fragment->appendXML($rewrite_rule);
+	$rules_node->appendChild($rule_fragment);
 
 	$doc->encoding     = 'UTF-8';
 	$doc->formatOutput = true;
-	saveDomDocument( $doc, $filename );
+	saveDomDocument($doc, $filename);
 
 	return true;
 }
@@ -968,13 +968,13 @@ 
  * @param DOMDocument $doc
  * @param string      $filename
  */
-function saveDomDocument( $doc, $filename ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function saveDomDocument($doc, $filename) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
 	$config = $doc->saveXML();
-	$config = preg_replace( "/([^\r])\n/", "$1\r\n", $config );
+	$config = preg_replace("/([^\r])\n/", "$1\r\n", $config);
 
-	$fp = fopen( $filename, 'w' );
-	fwrite( $fp, $config );
-	fclose( $fp );
+	$fp = fopen($filename, 'w');
+	fwrite($fp, $config);
+	fclose($fp);
 }
 
 /**
@@ -986,12 +986,12 @@ 
  *
  * @param int $user_id User ID.
  */
-function admin_color_scheme_picker( $user_id ) {
+function admin_color_scheme_picker($user_id) {
 	global $_wp_admin_css_colors;
 
-	ksort( $_wp_admin_css_colors );
+	ksort($_wp_admin_css_colors);
 
-	if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
+	if (isset($_wp_admin_css_colors['fresh'])) {
 		// Set Default ('fresh') and Light should go first.
 		$_wp_admin_css_colors = array_filter(
 			array_merge(
@@ -1005,30 +1005,30 @@ 
 		);
 	}
 
-	$current_color = get_user_option( 'admin_color', $user_id );
+	$current_color = get_user_option('admin_color', $user_id);
 
-	if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
+	if (empty($current_color) || !isset($_wp_admin_css_colors[$current_color])) {
 		$current_color = 'fresh';
 	}
 	?>
 	<fieldset id="color-picker" class="scheme-list">
-		<legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
+		<legend class="screen-reader-text"><span><?php _e('Admin Color Scheme'); ?></span></legend>
 		<?php
-		wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
-		foreach ( $_wp_admin_css_colors as $color => $color_info ) :
+		wp_nonce_field('save-color-scheme', 'color-nonce', false);
+		foreach ($_wp_admin_css_colors as $color => $color_info) :
 
 			?>
-			<div class="color-option <?php echo ( $color === $current_color ) ? 'selected' : ''; ?>">
-				<input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
-				<input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
-				<input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
-				<label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
+			<div class="color-option <?php echo ($color === $current_color) ? 'selected' : ''; ?>">
+				<input name="admin_color" id="admin_color_<?php echo esc_attr($color); ?>" type="radio" value="<?php echo esc_attr($color); ?>" class="tog" <?php checked($color, $current_color); ?> />
+				<input type="hidden" class="css_url" value="<?php echo esc_url($color_info->url); ?>" />
+				<input type="hidden" class="icon_colors" value="<?php echo esc_attr(wp_json_encode(array('icons' => $color_info->icon_colors))); ?>" />
+				<label for="admin_color_<?php echo esc_attr($color); ?>"><?php echo esc_html($color_info->name); ?></label>
 				<table class="color-palette">
 					<tr>
 					<?php
-					foreach ( $color_info->colors as $html_color ) {
+					foreach ($color_info->colors as $html_color) {
 						?>
-						<td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
+						<td style="background-color: <?php echo esc_attr($html_color); ?>">&nbsp;</td>
 						<?php
 					}
 					?>
@@ -1050,16 +1050,16 @@ 
 function wp_color_scheme_settings() {
 	global $_wp_admin_css_colors;
 
-	$color_scheme = get_user_option( 'admin_color' );
+	$color_scheme = get_user_option('admin_color');
 
 	// It's possible to have a color scheme set that is no longer registered.
-	if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+	if (empty($_wp_admin_css_colors[$color_scheme])) {
 		$color_scheme = 'fresh';
 	}
 
-	if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
-		$icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
-	} elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
+	if (!empty($_wp_admin_css_colors[$color_scheme]->icon_colors)) {
+		$icon_colors = $_wp_admin_css_colors[$color_scheme]->icon_colors;
+	} elseif (!empty($_wp_admin_css_colors['fresh']->icon_colors)) {
 		$icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
 	} else {
 		// Fall back to the default set of icon colors if the default scheme is missing.
@@ -1070,7 +1070,7 @@ 
 		);
 	}
 
-	echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+	echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode(array('icons' => $icon_colors)) . ";</script>\n";
 }
 
 /**
@@ -1086,13 +1086,13 @@ 
 	 *
 	 * @param string $viewport_meta The viewport meta.
 	 */
-	$viewport_meta = apply_filters( 'admin_viewport_meta', 'width=device-width,initial-scale=1.0' );
+	$viewport_meta = apply_filters('admin_viewport_meta', 'width=device-width,initial-scale=1.0');
 
-	if ( empty( $viewport_meta ) ) {
+	if (empty($viewport_meta)) {
 		return;
 	}
 
-	echo '<meta name="viewport" content="' . esc_attr( $viewport_meta ) . '">';
+	echo '<meta name="viewport" content="' . esc_attr($viewport_meta) . '">';
 }
 
 /**
@@ -1105,8 +1105,8 @@ 
  * @param string $viewport_meta The viewport meta.
  * @return string Filtered viewport meta.
  */
-function _customizer_mobile_viewport_meta( $viewport_meta ) {
-	return trim( $viewport_meta, ',' ) . ',minimum-scale=0.5,maximum-scale=1.2';
+function _customizer_mobile_viewport_meta($viewport_meta) {
+	return trim($viewport_meta, ',') . ',minimum-scale=0.5,maximum-scale=1.2';
 }
 
 /**
@@ -1119,41 +1119,41 @@ 
  * @param string $screen_id The screen ID.
  * @return array The Heartbeat response.
  */
-function wp_check_locked_posts( $response, $data, $screen_id ) {
+function wp_check_locked_posts($response, $data, $screen_id) {
 	$checked = array();
 
-	if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
-		foreach ( $data['wp-check-locked-posts'] as $key ) {
-			$post_id = absint( substr( $key, 5 ) );
+	if (array_key_exists('wp-check-locked-posts', $data) && is_array($data['wp-check-locked-posts'])) {
+		foreach ($data['wp-check-locked-posts'] as $key) {
+			$post_id = absint(substr($key, 5));
 
-			if ( ! $post_id ) {
+			if (!$post_id) {
 				continue;
 			}
 
-			$user_id = wp_check_post_lock( $post_id );
+			$user_id = wp_check_post_lock($post_id);
 
-			if ( $user_id ) {
-				$user = get_userdata( $user_id );
+			if ($user_id) {
+				$user = get_userdata($user_id);
 
-				if ( $user && current_user_can( 'edit_post', $post_id ) ) {
+				if ($user && current_user_can('edit_post', $post_id)) {
 					$send = array(
 						'name' => $user->display_name,
 						/* translators: %s: User's display name. */
-						'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
+						'text' => sprintf(__('%s is currently editing'), $user->display_name),
 					);
 
-					if ( get_option( 'show_avatars' ) ) {
-						$send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
-						$send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
+					if (get_option('show_avatars')) {
+						$send['avatar_src']    = get_avatar_url($user->ID, array('size' => 18));
+						$send['avatar_src_2x'] = get_avatar_url($user->ID, array('size' => 36));
 					}
 
-					$checked[ $key ] = $send;
+					$checked[$key] = $send;
 				}
 			}
 		}
 	}
 
-	if ( ! empty( $checked ) ) {
+	if (!empty($checked)) {
 		$response['wp-check-locked-posts'] = $checked;
 	}
 
@@ -1170,42 +1170,42 @@ 
  * @param string $screen_id The screen ID.
  * @return array The Heartbeat response.
  */
-function wp_refresh_post_lock( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+function wp_refresh_post_lock($response, $data, $screen_id) {
+	if (array_key_exists('wp-refresh-post-lock', $data)) {
 		$received = $data['wp-refresh-post-lock'];
 		$send     = array();
 
-		$post_id = absint( $received['post_id'] );
+		$post_id = absint($received['post_id']);
 
-		if ( ! $post_id ) {
+		if (!$post_id) {
 			return $response;
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return $response;
 		}
 
-		$user_id = wp_check_post_lock( $post_id );
-		$user    = get_userdata( $user_id );
+		$user_id = wp_check_post_lock($post_id);
+		$user    = get_userdata($user_id);
 
-		if ( $user ) {
+		if ($user) {
 			$error = array(
 				'name' => $user->display_name,
 				/* translators: %s: User's display name. */
-				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ),
+				'text' => sprintf(__('%s has taken over and is currently editing.'), $user->display_name),
 			);
 
-			if ( get_option( 'show_avatars' ) ) {
-				$error['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 64 ) );
-				$error['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 128 ) );
+			if (get_option('show_avatars')) {
+				$error['avatar_src']    = get_avatar_url($user->ID, array('size' => 64));
+				$error['avatar_src_2x'] = get_avatar_url($user->ID, array('size' => 128));
 			}
 
 			$send['lock_error'] = $error;
 		} else {
-			$new_lock = wp_set_post_lock( $post_id );
+			$new_lock = wp_set_post_lock($post_id);
 
-			if ( $new_lock ) {
-				$send['new_lock'] = implode( ':', $new_lock );
+			if ($new_lock) {
+				$send['new_lock'] = implode(':', $new_lock);
 			}
 		}
 
@@ -1225,29 +1225,29 @@ 
  * @param string $screen_id The screen ID.
  * @return array The Heartbeat response.
  */
-function wp_refresh_post_nonces( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+function wp_refresh_post_nonces($response, $data, $screen_id) {
+	if (array_key_exists('wp-refresh-post-nonces', $data)) {
 		$received = $data['wp-refresh-post-nonces'];
 
-		$response['wp-refresh-post-nonces'] = array( 'check' => 1 );
+		$response['wp-refresh-post-nonces'] = array('check' => 1);
 
-		$post_id = absint( $received['post_id'] );
+		$post_id = absint($received['post_id']);
 
-		if ( ! $post_id ) {
+		if (!$post_id) {
 			return $response;
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return $response;
 		}
 
 		$response['wp-refresh-post-nonces'] = array(
 			'replace' => array(
-				'getpermalinknonce'    => wp_create_nonce( 'getpermalink' ),
-				'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
-				'closedpostboxesnonce' => wp_create_nonce( 'closedpostboxes' ),
-				'_ajax_linking_nonce'  => wp_create_nonce( 'internal-linking' ),
-				'_wpnonce'             => wp_create_nonce( 'update-post_' . $post_id ),
+				'getpermalinknonce'    => wp_create_nonce('getpermalink'),
+				'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+				'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+				'_ajax_linking_nonce'  => wp_create_nonce('internal-linking'),
+				'_wpnonce'             => wp_create_nonce('update-post_' . $post_id),
 			),
 		);
 	}
@@ -1263,12 +1263,12 @@ 
  * @param array $response The Heartbeat response.
  * @return array The Heartbeat response.
  */
-function wp_refresh_heartbeat_nonces( $response ) {
+function wp_refresh_heartbeat_nonces($response) {
 	// Refresh the Rest API nonce.
-	$response['rest_nonce'] = wp_create_nonce( 'wp_rest' );
+	$response['rest_nonce'] = wp_create_nonce('wp_rest');
 
 	// Refresh the Heartbeat nonce.
-	$response['heartbeat_nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	$response['heartbeat_nonce'] = wp_create_nonce('heartbeat-nonce');
 
 	return $response;
 }
@@ -1283,10 +1283,10 @@ 
  * @param array $settings An array of Heartbeat settings.
  * @return array Filtered Heartbeat settings.
  */
-function wp_heartbeat_set_suspension( $settings ) {
+function wp_heartbeat_set_suspension($settings) {
 	global $pagenow;
 
-	if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
+	if ('post.php' === $pagenow || 'post-new.php' === $pagenow) {
 		$settings['suspension'] = 'disable';
 	}
 
@@ -1302,27 +1302,27 @@ 
  * @param array $data     The $_POST data sent.
  * @return array The Heartbeat response.
  */
-function heartbeat_autosave( $response, $data ) {
-	if ( ! empty( $data['wp_autosave'] ) ) {
-		$saved = wp_autosave( $data['wp_autosave'] );
+function heartbeat_autosave($response, $data) {
+	if (!empty($data['wp_autosave'])) {
+		$saved = wp_autosave($data['wp_autosave']);
 
-		if ( is_wp_error( $saved ) ) {
+		if (is_wp_error($saved)) {
 			$response['wp_autosave'] = array(
 				'success' => false,
 				'message' => $saved->get_error_message(),
 			);
-		} elseif ( empty( $saved ) ) {
+		} elseif (empty($saved)) {
 			$response['wp_autosave'] = array(
 				'success' => false,
-				'message' => __( 'Error while saving.' ),
+				'message' => __('Error while saving.'),
 			);
 		} else {
 			/* translators: Draft saved date format, see https://www.php.net/manual/datetime.format.php */
-			$draft_saved_date_format = __( 'g:i:s a' );
+			$draft_saved_date_format = __('g:i:s a');
 			$response['wp_autosave'] = array(
 				'success' => true,
 				/* translators: %s: Date and time. */
-				'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ),
+				'message' => sprintf(__('Draft saved at %s.'), date_i18n($draft_saved_date_format)),
 			);
 		}
 	}
@@ -1341,15 +1341,15 @@ 
 function wp_admin_canonical_url() {
 	$removable_query_args = wp_removable_query_args();
 
-	if ( empty( $removable_query_args ) ) {
+	if (empty($removable_query_args)) {
 		return;
 	}
 
 	// Ensure we're using an absolute URL.
-	$current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-	$filtered_url = remove_query_arg( $removable_query_args, $current_url );
+	$current_url  = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+	$filtered_url = remove_query_arg($removable_query_args, $current_url);
 	?>
-	<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
+	<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url($filtered_url); ?>" />
 	<script>
 		if ( window.history.replaceState ) {
 			window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
@@ -1376,9 +1376,9 @@ 
 	 *
 	 * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
 	 */
-	$policy = apply_filters( 'admin_referrer_policy', $policy );
+	$policy = apply_filters('admin_referrer_policy', $policy);
 
-	header( sprintf( 'Referrer-Policy: %s', $policy ) );
+	header(sprintf('Referrer-Policy: %s', $policy));
 }
 
 /**
@@ -1410,19 +1410,19 @@ 
  * @param string $old_value The old site admin email address.
  * @param string $value     The proposed new site admin email address.
  */
-function update_option_new_admin_email( $old_value, $value ) {
-	if ( get_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
+function update_option_new_admin_email($old_value, $value) {
+	if (get_option('admin_email') === $value || !is_email($value)) {
 		return;
 	}
 
-	$hash            = md5( $value . time() . wp_rand() );
+	$hash            = md5($value . time() . wp_rand());
 	$new_admin_email = array(
 		'hash'     => $hash,
 		'newemail' => $value,
 	);
-	update_option( 'adminhash', $new_admin_email );
+	update_option('adminhash', $new_admin_email);
 
-	$switched_locale = switch_to_locale( get_user_locale() );
+	$switched_locale = switch_to_locale(get_user_locale());
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
@@ -1466,32 +1466,32 @@ 
 	 *     @type string $newemail The proposed new site admin email address.
 	 * }
 	 */
-	$content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
+	$content = apply_filters('new_admin_email_content', $email_text, $new_admin_email);
 
 	$current_user = wp_get_current_user();
-	$content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content      = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
-	$content      = str_replace( '###EMAIL###', $value, $content );
-	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
-	$content      = str_replace( '###SITEURL###', home_url(), $content );
-
-	if ( '' !== get_option( 'blogname' ) ) {
-		$site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+	$content      = str_replace('###USERNAME###', $current_user->user_login, $content);
+	$content      = str_replace('###ADMIN_URL###', esc_url(self_admin_url('options.php?adminhash=' . $hash)), $content);
+	$content      = str_replace('###EMAIL###', $value, $content);
+	$content      = str_replace('###SITENAME###', wp_specialchars_decode(get_option('blogname'), ENT_QUOTES), $content);
+	$content      = str_replace('###SITEURL###', home_url(), $content);
+
+	if ('' !== get_option('blogname')) {
+		$site_title = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 	} else {
-		$site_title = parse_url( home_url(), PHP_URL_HOST );
+		$site_title = parse_url(home_url(), PHP_URL_HOST);
 	}
 
 	wp_mail(
 		$value,
 		sprintf(
 			/* translators: New admin email address notification email subject. %s: Site title. */
-			__( '[%s] New Admin Email Address' ),
+			__('[%s] New Admin Email Address'),
 			$site_title
 		),
 		$content
 	);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 }
@@ -1507,10 +1507,10 @@ 
  * @param WP_Post $page  Page data object.
  * @return string Page title.
  */
-function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) {
-	if ( 'draft' === $page->post_status && 'privacy' === get_current_screen()->id ) {
+function _wp_privacy_settings_filter_draft_page_titles($title, $page) {
+	if ('draft' === $page->post_status && 'privacy' === get_current_screen()->id) {
 		/* translators: %s: Page title. */
-		$title = sprintf( __( '%s (Draft)' ), $title );
+		$title = sprintf(__('%s (Draft)'), $title);
 	}
 
 	return $title;
@@ -1526,22 +1526,22 @@ 
  */
 function wp_check_php_version() {
 	$version = phpversion();
-	$key     = md5( $version );
+	$key     = md5($version);
 
-	$response = get_site_transient( 'php_check_' . $key );
+	$response = get_site_transient('php_check_' . $key);
 
-	if ( false === $response ) {
+	if (false === $response) {
 		$url = 'http://api.wordpress.org/core/serve-happy/1.0/';
 
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
+		if (wp_http_supports(array('ssl'))) {
+			$url = set_url_scheme($url, 'https');
 		}
 
-		$url = add_query_arg( 'php_version', $version, $url );
+		$url = add_query_arg('php_version', $version, $url);
 
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
 			return false;
 		}
 
@@ -1552,16 +1552,16 @@ 
 		 *  'is_secure' - boolean - Whether the PHP version receives security updates.
 		 *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
 		 */
-		$response = json_decode( wp_remote_retrieve_body( $response ), true );
+		$response = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $response ) ) {
+		if (!is_array($response)) {
 			return false;
 		}
 
-		set_site_transient( 'php_check_' . $key, $response, WEEK_IN_SECONDS );
+		set_site_transient('php_check_' . $key, $response, WEEK_IN_SECONDS);
 	}
 
-	if ( isset( $response['is_acceptable'] ) && $response['is_acceptable'] ) {
+	if (isset($response['is_acceptable']) && $response['is_acceptable']) {
 		/**
 		 * Filters whether the active PHP version is considered acceptable by WordPress.
 		 *
@@ -1575,7 +1575,7 @@ 
 		 * @param bool   $is_acceptable Whether the PHP version is considered acceptable. Default true.
 		 * @param string $version       PHP version checked.
 		 */
-		$response['is_acceptable'] = (bool) apply_filters( 'wp_is_php_version_acceptable', true, $version );
+		$response['is_acceptable'] = (bool) apply_filters('wp_is_php_version_acceptable', true, $version);
 	}
 
 	return $response;

brighty/wp-admin/includes/class-wp-ms-sites-list-table.php

Indentation +717 added lines, -717 removed lines

@@ -17,738 +17,738 @@
  */
 class WP_MS_Sites_List_Table extends WP_List_Table {
 
-	/**
-	 * Site status list.
-	 *
-	 * @since 4.3.0
-	 * @var array
-	 */
-	public $status_list;
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @see WP_List_Table::__construct() for more information on default arguments.
-	 *
-	 * @param array $args An associative array of arguments.
-	 */
-	public function __construct( $args = array() ) {
-		$this->status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) ),
-		);
-
-		parent::__construct(
-			array(
-				'plural' => 'sites',
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-			)
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function ajax_user_can() {
-		return current_user_can( 'manage_sites' );
-	}
-
-	/**
-	 * Prepares the list of sites for display.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global string $mode List table view mode.
-	 * @global string $s
-	 * @global wpdb   $wpdb WordPress database abstraction object.
-	 */
-	public function prepare_items() {
-		global $mode, $s, $wpdb;
-
-		if ( ! empty( $_REQUEST['mode'] ) ) {
-			$mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
-			set_user_setting( 'sites_list_mode', $mode );
-		} else {
-			$mode = get_user_setting( 'sites_list_mode', 'list' );
-		}
-
-		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
-
-		$pagenum = $this->get_pagenum();
-
-		$s    = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
-		$wild = '';
-		if ( false !== strpos( $s, '*' ) ) {
-			$wild = '*';
-			$s    = trim( $s, '*' );
-		}
-
-		/*
+    /**
+     * Site status list.
+     *
+     * @since 4.3.0
+     * @var array
+     */
+    public $status_list;
+
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        $this->status_list = array(
+            'archived' => array( 'site-archived', __( 'Archived' ) ),
+            'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+            'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
+            'mature'   => array( 'site-mature', __( 'Mature' ) ),
+        );
+
+        parent::__construct(
+            array(
+                'plural' => 'sites',
+                'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+            )
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can( 'manage_sites' );
+    }
+
+    /**
+     * Prepares the list of sites for display.
+     *
+     * @since 3.1.0
+     *
+     * @global string $mode List table view mode.
+     * @global string $s
+     * @global wpdb   $wpdb WordPress database abstraction object.
+     */
+    public function prepare_items() {
+        global $mode, $s, $wpdb;
+
+        if ( ! empty( $_REQUEST['mode'] ) ) {
+            $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
+            set_user_setting( 'sites_list_mode', $mode );
+        } else {
+            $mode = get_user_setting( 'sites_list_mode', 'list' );
+        }
+
+        $per_page = $this->get_items_per_page( 'sites_network_per_page' );
+
+        $pagenum = $this->get_pagenum();
+
+        $s    = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+        $wild = '';
+        if ( false !== strpos( $s, '*' ) ) {
+            $wild = '*';
+            $s    = trim( $s, '*' );
+        }
+
+        /*
 		 * If the network is large and a search is not being performed, show only
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
-		if ( ! $s && wp_is_large_network() ) {
-			if ( ! isset( $_REQUEST['orderby'] ) ) {
-				$_GET['orderby']     = '';
-				$_REQUEST['orderby'] = '';
-			}
-			if ( ! isset( $_REQUEST['order'] ) ) {
-				$_GET['order']     = 'DESC';
-				$_REQUEST['order'] = 'DESC';
-			}
-		}
-
-		$args = array(
-			'number'     => (int) $per_page,
-			'offset'     => (int) ( ( $pagenum - 1 ) * $per_page ),
-			'network_id' => get_current_network_id(),
-		);
-
-		if ( empty( $s ) ) {
-			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
-			// IPv4 address.
-			$sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
-			$reg_blog_ids = $wpdb->get_col( $sql );
-
-			if ( $reg_blog_ids ) {
-				$args['site__in'] = $reg_blog_ids;
-			}
-		} elseif ( is_numeric( $s ) && empty( $wild ) ) {
-			$args['ID'] = $s;
-		} else {
-			$args['search'] = $s;
-
-			if ( ! is_subdomain_install() ) {
-				$args['search_columns'] = array( 'path' );
-			}
-		}
-
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( 'registered' === $order_by ) {
-			// 'registered' is a valid field name.
-		} elseif ( 'lastupdated' === $order_by ) {
-			$order_by = 'last_updated';
-		} elseif ( 'blogname' === $order_by ) {
-			if ( is_subdomain_install() ) {
-				$order_by = 'domain';
-			} else {
-				$order_by = 'path';
-			}
-		} elseif ( 'blog_id' === $order_by ) {
-			$order_by = 'id';
-		} elseif ( ! $order_by ) {
-			$order_by = false;
-		}
-
-		$args['orderby'] = $order_by;
-
-		if ( $order_by ) {
-			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
-		}
-
-		if ( wp_is_large_network() ) {
-			$args['no_found_rows'] = true;
-		} else {
-			$args['no_found_rows'] = false;
-		}
-
-		// Take into account the role the user has selected.
-		$status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
-		if ( in_array( $status, array( 'public', 'archived', 'mature', 'spam', 'deleted' ), true ) ) {
-			$args[ $status ] = 1;
-		}
-
-		/**
-		 * Filters the arguments for the site query in the sites list table.
-		 *
-		 * @since 4.6.0
-		 *
-		 * @param array $args An array of get_sites() arguments.
-		 */
-		$args = apply_filters( 'ms_sites_list_table_query_args', $args );
-
-		$_sites = get_sites( $args );
-		if ( is_array( $_sites ) ) {
-			update_site_cache( $_sites );
-
-			$this->items = array_slice( $_sites, 0, $per_page );
-		}
-
-		$total_sites = get_sites(
-			array_merge(
-				$args,
-				array(
-					'count'  => true,
-					'offset' => 0,
-					'number' => 0,
-				)
-			)
-		);
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $total_sites,
-				'per_page'    => $per_page,
-			)
-		);
-	}
-
-	/**
-	 */
-	public function no_items() {
-		_e( 'No sites found.' );
-	}
-
-	/**
-	 * Gets links to filter sites by status.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @return array
-	 */
-	protected function get_views() {
-		$counts = wp_count_sites();
-
-		$statuses = array(
-			/* translators: %s: Number of sites. */
-			'all'      => _nx_noop(
-				'All <span class="count">(%s)</span>',
-				'All <span class="count">(%s)</span>',
-				'sites'
-			),
-
-			/* translators: %s: Number of sites. */
-			'public'   => _n_noop(
-				'Public <span class="count">(%s)</span>',
-				'Public <span class="count">(%s)</span>'
-			),
-
-			/* translators: %s: Number of sites. */
-			'archived' => _n_noop(
-				'Archived <span class="count">(%s)</span>',
-				'Archived <span class="count">(%s)</span>'
-			),
-
-			/* translators: %s: Number of sites. */
-			'mature'   => _n_noop(
-				'Mature <span class="count">(%s)</span>',
-				'Mature <span class="count">(%s)</span>'
-			),
-
-			/* translators: %s: Number of sites. */
-			'spam'     => _nx_noop(
-				'Spam <span class="count">(%s)</span>',
-				'Spam <span class="count">(%s)</span>',
-				'sites'
-			),
-
-			/* translators: %s: Number of sites. */
-			'deleted'  => _n_noop(
-				'Deleted <span class="count">(%s)</span>',
-				'Deleted <span class="count">(%s)</span>'
-			),
-		);
-
-		$view_links       = array();
-		$requested_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
-		$url              = 'sites.php';
-
-		foreach ( $statuses as $status => $label_count ) {
-			$current_link_attributes = $requested_status === $status || ( '' === $requested_status && 'all' === $status )
-				? ' class="current" aria-current="page"'
-				: '';
-			if ( (int) $counts[ $status ] > 0 ) {
-				$label    = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
-				$full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
-
-				$view_links[ $status ] = sprintf(
-					'<a href="%1$s"%2$s>%3$s</a>',
-					esc_url( $full_url ),
-					$current_link_attributes,
-					$label
-				);
-			}
-		}
-
-		return $view_links;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function get_bulk_actions() {
-		$actions = array();
-		if ( current_user_can( 'delete_sites' ) ) {
-			$actions['delete'] = __( 'Delete' );
-		}
-		$actions['spam']    = _x( 'Mark as spam', 'site' );
-		$actions['notspam'] = _x( 'Not spam', 'site' );
-
-		return $actions;
-	}
-
-	/**
-	 * @global string $mode List table view mode.
-	 *
-	 * @param string $which The location of the pagination nav markup: 'top' or 'bottom'.
-	 */
-	protected function pagination( $which ) {
-		global $mode;
-
-		parent::pagination( $which );
-
-		if ( 'top' === $which ) {
-			$this->view_switcher( $mode );
-		}
-	}
-
-	/**
-	 * Extra controls to be displayed between bulk actions and pagination.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
-	 */
-	protected function extra_tablenav( $which ) {
-		?>
+        if ( ! $s && wp_is_large_network() ) {
+            if ( ! isset( $_REQUEST['orderby'] ) ) {
+                $_GET['orderby']     = '';
+                $_REQUEST['orderby'] = '';
+            }
+            if ( ! isset( $_REQUEST['order'] ) ) {
+                $_GET['order']     = 'DESC';
+                $_REQUEST['order'] = 'DESC';
+            }
+        }
+
+        $args = array(
+            'number'     => (int) $per_page,
+            'offset'     => (int) ( ( $pagenum - 1 ) * $per_page ),
+            'network_id' => get_current_network_id(),
+        );
+
+        if ( empty( $s ) ) {
+            // Nothing to do.
+        } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
+                    preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
+                    preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
+                    preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+            // IPv4 address.
+            $sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
+            $reg_blog_ids = $wpdb->get_col( $sql );
+
+            if ( $reg_blog_ids ) {
+                $args['site__in'] = $reg_blog_ids;
+            }
+        } elseif ( is_numeric( $s ) && empty( $wild ) ) {
+            $args['ID'] = $s;
+        } else {
+            $args['search'] = $s;
+
+            if ( ! is_subdomain_install() ) {
+                $args['search_columns'] = array( 'path' );
+            }
+        }
+
+        $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
+        if ( 'registered' === $order_by ) {
+            // 'registered' is a valid field name.
+        } elseif ( 'lastupdated' === $order_by ) {
+            $order_by = 'last_updated';
+        } elseif ( 'blogname' === $order_by ) {
+            if ( is_subdomain_install() ) {
+                $order_by = 'domain';
+            } else {
+                $order_by = 'path';
+            }
+        } elseif ( 'blog_id' === $order_by ) {
+            $order_by = 'id';
+        } elseif ( ! $order_by ) {
+            $order_by = false;
+        }
+
+        $args['orderby'] = $order_by;
+
+        if ( $order_by ) {
+            $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
+        }
+
+        if ( wp_is_large_network() ) {
+            $args['no_found_rows'] = true;
+        } else {
+            $args['no_found_rows'] = false;
+        }
+
+        // Take into account the role the user has selected.
+        $status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+        if ( in_array( $status, array( 'public', 'archived', 'mature', 'spam', 'deleted' ), true ) ) {
+            $args[ $status ] = 1;
+        }
+
+        /**
+         * Filters the arguments for the site query in the sites list table.
+         *
+         * @since 4.6.0
+         *
+         * @param array $args An array of get_sites() arguments.
+         */
+        $args = apply_filters( 'ms_sites_list_table_query_args', $args );
+
+        $_sites = get_sites( $args );
+        if ( is_array( $_sites ) ) {
+            update_site_cache( $_sites );
+
+            $this->items = array_slice( $_sites, 0, $per_page );
+        }
+
+        $total_sites = get_sites(
+            array_merge(
+                $args,
+                array(
+                    'count'  => true,
+                    'offset' => 0,
+                    'number' => 0,
+                )
+            )
+        );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $total_sites,
+                'per_page'    => $per_page,
+            )
+        );
+    }
+
+    /**
+     */
+    public function no_items() {
+        _e( 'No sites found.' );
+    }
+
+    /**
+     * Gets links to filter sites by status.
+     *
+     * @since 5.3.0
+     *
+     * @return array
+     */
+    protected function get_views() {
+        $counts = wp_count_sites();
+
+        $statuses = array(
+            /* translators: %s: Number of sites. */
+            'all'      => _nx_noop(
+                'All <span class="count">(%s)</span>',
+                'All <span class="count">(%s)</span>',
+                'sites'
+            ),
+
+            /* translators: %s: Number of sites. */
+            'public'   => _n_noop(
+                'Public <span class="count">(%s)</span>',
+                'Public <span class="count">(%s)</span>'
+            ),
+
+            /* translators: %s: Number of sites. */
+            'archived' => _n_noop(
+                'Archived <span class="count">(%s)</span>',
+                'Archived <span class="count">(%s)</span>'
+            ),
+
+            /* translators: %s: Number of sites. */
+            'mature'   => _n_noop(
+                'Mature <span class="count">(%s)</span>',
+                'Mature <span class="count">(%s)</span>'
+            ),
+
+            /* translators: %s: Number of sites. */
+            'spam'     => _nx_noop(
+                'Spam <span class="count">(%s)</span>',
+                'Spam <span class="count">(%s)</span>',
+                'sites'
+            ),
+
+            /* translators: %s: Number of sites. */
+            'deleted'  => _n_noop(
+                'Deleted <span class="count">(%s)</span>',
+                'Deleted <span class="count">(%s)</span>'
+            ),
+        );
+
+        $view_links       = array();
+        $requested_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+        $url              = 'sites.php';
+
+        foreach ( $statuses as $status => $label_count ) {
+            $current_link_attributes = $requested_status === $status || ( '' === $requested_status && 'all' === $status )
+                ? ' class="current" aria-current="page"'
+                : '';
+            if ( (int) $counts[ $status ] > 0 ) {
+                $label    = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
+                $full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
+
+                $view_links[ $status ] = sprintf(
+                    '<a href="%1$s"%2$s>%3$s</a>',
+                    esc_url( $full_url ),
+                    $current_link_attributes,
+                    $label
+                );
+            }
+        }
+
+        return $view_links;
+    }
+
+    /**
+     * @return array
+     */
+    protected function get_bulk_actions() {
+        $actions = array();
+        if ( current_user_can( 'delete_sites' ) ) {
+            $actions['delete'] = __( 'Delete' );
+        }
+        $actions['spam']    = _x( 'Mark as spam', 'site' );
+        $actions['notspam'] = _x( 'Not spam', 'site' );
+
+        return $actions;
+    }
+
+    /**
+     * @global string $mode List table view mode.
+     *
+     * @param string $which The location of the pagination nav markup: 'top' or 'bottom'.
+     */
+    protected function pagination( $which ) {
+        global $mode;
+
+        parent::pagination( $which );
+
+        if ( 'top' === $which ) {
+            $this->view_switcher( $mode );
+        }
+    }
+
+    /**
+     * Extra controls to be displayed between bulk actions and pagination.
+     *
+     * @since 5.3.0
+     *
+     * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+     */
+    protected function extra_tablenav( $which ) {
+        ?>
 		<div class="alignleft actions">
 		<?php
-		if ( 'top' === $which ) {
-			ob_start();
-
-			/**
-			 * Fires before the Filter button on the MS sites list table.
-			 *
-			 * @since 5.3.0
-			 *
-			 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
-			 */
-			do_action( 'restrict_manage_sites', $which );
-
-			$output = ob_get_clean();
-
-			if ( ! empty( $output ) ) {
-				echo $output;
-				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'site-query-submit' ) );
-			}
-		}
-		?>
+        if ( 'top' === $which ) {
+            ob_start();
+
+            /**
+             * Fires before the Filter button on the MS sites list table.
+             *
+             * @since 5.3.0
+             *
+             * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+             */
+            do_action( 'restrict_manage_sites', $which );
+
+            $output = ob_get_clean();
+
+            if ( ! empty( $output ) ) {
+                echo $output;
+                submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'site-query-submit' ) );
+            }
+        }
+        ?>
 		</div>
 		<?php
-		/**
-		 * Fires immediately following the closing "actions" div in the tablenav for the
-		 * MS sites list table.
-		 *
-		 * @since 5.3.0
-		 *
-		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
-		 */
-		do_action( 'manage_sites_extra_tablenav', $which );
-	}
-
-	/**
-	 * @return array
-	 */
-	public function get_columns() {
-		$sites_columns = array(
-			'cb'          => '<input type="checkbox" />',
-			'blogname'    => __( 'URL' ),
-			'lastupdated' => __( 'Last Updated' ),
-			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' ),
-		);
-
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			$sites_columns['plugins'] = __( 'Actions' );
-		}
-
-		/**
-		 * Filters the displayed site columns in Sites list table.
-		 *
-		 * @since MU (3.0.0)
-		 *
-		 * @param string[] $sites_columns An array of displayed site columns. Default 'cb',
-		 *                               'blogname', 'lastupdated', 'registered', 'users'.
-		 */
-		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function get_sortable_columns() {
-		return array(
-			'blogname'    => 'blogname',
-			'lastupdated' => 'lastupdated',
-			'registered'  => 'blog_id',
-		);
-	}
-
-	/**
-	 * Handles the checkbox column output.
-	 *
-	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param array $item Current site.
-	 */
-	public function column_cb( $item ) {
-		// Restores the more descriptive, specific name for use within this method.
-		$blog = $item;
-
-		if ( ! is_main_site( $blog['blog_id'] ) ) :
-			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-			?>
+        /**
+         * Fires immediately following the closing "actions" div in the tablenav for the
+         * MS sites list table.
+         *
+         * @since 5.3.0
+         *
+         * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+         */
+        do_action( 'manage_sites_extra_tablenav', $which );
+    }
+
+    /**
+     * @return array
+     */
+    public function get_columns() {
+        $sites_columns = array(
+            'cb'          => '<input type="checkbox" />',
+            'blogname'    => __( 'URL' ),
+            'lastupdated' => __( 'Last Updated' ),
+            'registered'  => _x( 'Registered', 'site' ),
+            'users'       => __( 'Users' ),
+        );
+
+        if ( has_filter( 'wpmublogsaction' ) ) {
+            $sites_columns['plugins'] = __( 'Actions' );
+        }
+
+        /**
+         * Filters the displayed site columns in Sites list table.
+         *
+         * @since MU (3.0.0)
+         *
+         * @param string[] $sites_columns An array of displayed site columns. Default 'cb',
+         *                               'blogname', 'lastupdated', 'registered', 'users'.
+         */
+        return apply_filters( 'wpmu_blogs_columns', $sites_columns );
+    }
+
+    /**
+     * @return array
+     */
+    protected function get_sortable_columns() {
+        return array(
+            'blogname'    => 'blogname',
+            'lastupdated' => 'lastupdated',
+            'registered'  => 'blog_id',
+        );
+    }
+
+    /**
+     * Handles the checkbox column output.
+     *
+     * @since 4.3.0
+     * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param array $item Current site.
+     */
+    public function column_cb( $item ) {
+        // Restores the more descriptive, specific name for use within this method.
+        $blog = $item;
+
+        if ( ! is_main_site( $blog['blog_id'] ) ) :
+            $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+            ?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
 				<?php
-				/* translators: %s: Site URL. */
-				printf( __( 'Select %s' ), $blogname );
-				?>
+                /* translators: %s: Site URL. */
+                printf( __( 'Select %s' ), $blogname );
+                ?>
 			</label>
 			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
 			<?php
-		endif;
-	}
-
-	/**
-	 * Handles the ID column output.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_id( $blog ) {
-		echo $blog['blog_id'];
-	}
-
-	/**
-	 * Handles the site name column output.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @global string $mode List table view mode.
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_blogname( $blog ) {
-		global $mode;
-
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-
-		?>
+        endif;
+    }
+
+    /**
+     * Handles the ID column output.
+     *
+     * @since 4.4.0
+     *
+     * @param array $blog Current site.
+     */
+    public function column_id( $blog ) {
+        echo $blog['blog_id'];
+    }
+
+    /**
+     * Handles the site name column output.
+     *
+     * @since 4.3.0
+     *
+     * @global string $mode List table view mode.
+     *
+     * @param array $blog Current site.
+     */
+    public function column_blogname( $blog ) {
+        global $mode;
+
+        $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+
+        ?>
 		<strong>
 			<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname; ?></a>
 			<?php $this->site_states( $blog ); ?>
 		</strong>
 		<?php
-		if ( 'list' !== $mode ) {
-			switch_to_blog( $blog['blog_id'] );
-			echo '<p>';
-			printf(
-				/* translators: 1: Site title, 2: Site tagline. */
-				__( '%1$s &#8211; %2$s' ),
-				get_option( 'blogname' ),
-				'<em>' . get_option( 'blogdescription' ) . '</em>'
-			);
-			echo '</p>';
-			restore_current_blog();
-		}
-	}
-
-	/**
-	 * Handles the lastupdated column output.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @global string $mode List table view mode.
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_lastupdated( $blog ) {
-		global $mode;
-
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
-		} else {
-			$date = __( 'Y/m/d g:i:s a' );
-		}
-
-		echo ( '0000-00-00 00:00:00' === $blog['last_updated'] ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
-	}
-
-	/**
-	 * Handles the registered column output.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @global string $mode List table view mode.
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_registered( $blog ) {
-		global $mode;
-
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
-		} else {
-			$date = __( 'Y/m/d g:i:s a' );
-		}
-
-		if ( '0000-00-00 00:00:00' === $blog['registered'] ) {
-			echo '&#x2014;';
-		} else {
-			echo mysql2date( $date, $blog['registered'] );
-		}
-	}
-
-	/**
-	 * Handles the users column output.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_users( $blog ) {
-		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
-		if ( ! $user_count ) {
-			$blog_users = new WP_User_Query(
-				array(
-					'blog_id'     => $blog['blog_id'],
-					'fields'      => 'ID',
-					'number'      => 1,
-					'count_total' => true,
-				)
-			);
-			$user_count = $blog_users->get_total();
-			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
-		}
-
-		printf(
-			'<a href="%s">%s</a>',
-			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
-			number_format_i18n( $user_count )
-		);
-	}
-
-	/**
-	 * Handles the plugins column output.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param array $blog Current site.
-	 */
-	public function column_plugins( $blog ) {
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			/**
-			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
-			 *
-			 * By default this column is hidden unless something is hooked to the action.
-			 *
-			 * @since MU (3.0.0)
-			 *
-			 * @param int $blog_id The site ID.
-			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
-		}
-	}
-
-	/**
-	 * Handles output for the default column.
-	 *
-	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param array  $item        Current site.
-	 * @param string $column_name Current column name.
-	 */
-	public function column_default( $item, $column_name ) {
-		/**
-		 * Fires for each registered custom column in the Sites list table.
-		 *
-		 * @since 3.1.0
-		 *
-		 * @param string $column_name The name of the column to display.
-		 * @param int    $blog_id     The site ID.
-		 */
-		do_action( 'manage_sites_custom_column', $column_name, $item['blog_id'] );
-	}
-
-	/**
-	 * @global string $mode List table view mode.
-	 */
-	public function display_rows() {
-		foreach ( $this->items as $blog ) {
-			$blog  = $blog->to_array();
-			$class = '';
-			reset( $this->status_list );
-
-			foreach ( $this->status_list as $status => $col ) {
-				if ( 1 == $blog[ $status ] ) {
-					$class = " class='{$col[0]}'";
-				}
-			}
-
-			echo "<tr{$class}>";
-
-			$this->single_row_columns( $blog );
-
-			echo '</tr>';
-		}
-	}
-
-	/**
-	 * Maybe output comma-separated site states.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param array $site
-	 */
-	protected function site_states( $site ) {
-		$site_states = array();
-
-		// $site is still an array, so get the object.
-		$_site = WP_Site::get_instance( $site['blog_id'] );
-
-		if ( is_main_site( $_site->id ) ) {
-			$site_states['main'] = __( 'Main' );
-		}
-
-		reset( $this->status_list );
-
-		$site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
-		foreach ( $this->status_list as $status => $col ) {
-			if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
-				$site_states[ $col[0] ] = $col[1];
-			}
-		}
-
-		/**
-		 * Filters the default site display states for items in the Sites list table.
-		 *
-		 * @since 5.3.0
-		 *
-		 * @param string[] $site_states An array of site states. Default 'Main',
-		 *                              'Archived', 'Mature', 'Spam', 'Deleted'.
-		 * @param WP_Site  $site        The current site object.
-		 */
-		$site_states = apply_filters( 'display_site_states', $site_states, $_site );
-
-		if ( ! empty( $site_states ) ) {
-			$state_count = count( $site_states );
-
-			$i = 0;
-
-			echo ' &mdash; ';
-
-			foreach ( $site_states as $state ) {
-				++$i;
-
-				$sep = ( $i < $state_count ) ? ', ' : '';
-
-				echo "<span class='post-state'>{$state}{$sep}</span>";
-			}
-		}
-	}
-
-	/**
-	 * Gets the name of the default primary column.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @return string Name of the default primary column, in this case, 'blogname'.
-	 */
-	protected function get_default_primary_column_name() {
-		return 'blogname';
-	}
-
-	/**
-	 * Generates and displays row action links.
-	 *
-	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param array  $item        Site being acted upon.
-	 * @param string $column_name Current column name.
-	 * @param string $primary     Primary column name.
-	 * @return string Row actions output for sites in Multisite, or an empty string
-	 *                if the current column is not the primary column.
-	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
-			return '';
-		}
-
-		// Restores the more descriptive, specific name for use within this method.
-		$blog     = $item;
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-
-		// Preordered.
-		$actions = array(
-			'edit'       => '',
-			'backend'    => '',
-			'activate'   => '',
-			'deactivate' => '',
-			'archive'    => '',
-			'unarchive'  => '',
-			'spam'       => '',
-			'unspam'     => '',
-			'delete'     => '',
-			'visit'      => '',
-		);
-
-		$actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-		if ( get_network()->site_id != $blog['blog_id'] ) {
-			if ( '1' == $blog['deleted'] ) {
-				$actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
-			} else {
-				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
-			}
-
-			if ( '1' == $blog['archived'] ) {
-				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
-			} else {
-				$actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
-			}
-
-			if ( '1' == $blog['spam'] ) {
-				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
-			} else {
-				$actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
-			}
-
-			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
-			}
-		}
-
-		$actions['visit'] = "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
-
-		/**
-		 * Filters the action links displayed for each site in the Sites list table.
-		 *
-		 * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
-		 * default for each site. The site's status determines whether to show the
-		 * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
-		 * 'Not Spam' or 'Spam' link for each site.
-		 *
-		 * @since 3.1.0
-		 *
-		 * @param string[] $actions  An array of action links to be displayed.
-		 * @param int      $blog_id  The site ID.
-		 * @param string   $blogname Site path, formatted depending on whether it is a sub-domain
-		 *                           or subdirectory multisite installation.
-		 */
-		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
-
-		return $this->row_actions( $actions );
-	}
+        if ( 'list' !== $mode ) {
+            switch_to_blog( $blog['blog_id'] );
+            echo '<p>';
+            printf(
+                /* translators: 1: Site title, 2: Site tagline. */
+                __( '%1$s &#8211; %2$s' ),
+                get_option( 'blogname' ),
+                '<em>' . get_option( 'blogdescription' ) . '</em>'
+            );
+            echo '</p>';
+            restore_current_blog();
+        }
+    }
+
+    /**
+     * Handles the lastupdated column output.
+     *
+     * @since 4.3.0
+     *
+     * @global string $mode List table view mode.
+     *
+     * @param array $blog Current site.
+     */
+    public function column_lastupdated( $blog ) {
+        global $mode;
+
+        if ( 'list' === $mode ) {
+            $date = __( 'Y/m/d' );
+        } else {
+            $date = __( 'Y/m/d g:i:s a' );
+        }
+
+        echo ( '0000-00-00 00:00:00' === $blog['last_updated'] ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+    }
+
+    /**
+     * Handles the registered column output.
+     *
+     * @since 4.3.0
+     *
+     * @global string $mode List table view mode.
+     *
+     * @param array $blog Current site.
+     */
+    public function column_registered( $blog ) {
+        global $mode;
+
+        if ( 'list' === $mode ) {
+            $date = __( 'Y/m/d' );
+        } else {
+            $date = __( 'Y/m/d g:i:s a' );
+        }
+
+        if ( '0000-00-00 00:00:00' === $blog['registered'] ) {
+            echo '&#x2014;';
+        } else {
+            echo mysql2date( $date, $blog['registered'] );
+        }
+    }
+
+    /**
+     * Handles the users column output.
+     *
+     * @since 4.3.0
+     *
+     * @param array $blog Current site.
+     */
+    public function column_users( $blog ) {
+        $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
+        if ( ! $user_count ) {
+            $blog_users = new WP_User_Query(
+                array(
+                    'blog_id'     => $blog['blog_id'],
+                    'fields'      => 'ID',
+                    'number'      => 1,
+                    'count_total' => true,
+                )
+            );
+            $user_count = $blog_users->get_total();
+            wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+        }
+
+        printf(
+            '<a href="%s">%s</a>',
+            esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
+            number_format_i18n( $user_count )
+        );
+    }
+
+    /**
+     * Handles the plugins column output.
+     *
+     * @since 4.3.0
+     *
+     * @param array $blog Current site.
+     */
+    public function column_plugins( $blog ) {
+        if ( has_filter( 'wpmublogsaction' ) ) {
+            /**
+             * Fires inside the auxiliary 'Actions' column of the Sites list table.
+             *
+             * By default this column is hidden unless something is hooked to the action.
+             *
+             * @since MU (3.0.0)
+             *
+             * @param int $blog_id The site ID.
+             */
+            do_action( 'wpmublogsaction', $blog['blog_id'] );
+        }
+    }
+
+    /**
+     * Handles output for the default column.
+     *
+     * @since 4.3.0
+     * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param array  $item        Current site.
+     * @param string $column_name Current column name.
+     */
+    public function column_default( $item, $column_name ) {
+        /**
+         * Fires for each registered custom column in the Sites list table.
+         *
+         * @since 3.1.0
+         *
+         * @param string $column_name The name of the column to display.
+         * @param int    $blog_id     The site ID.
+         */
+        do_action( 'manage_sites_custom_column', $column_name, $item['blog_id'] );
+    }
+
+    /**
+     * @global string $mode List table view mode.
+     */
+    public function display_rows() {
+        foreach ( $this->items as $blog ) {
+            $blog  = $blog->to_array();
+            $class = '';
+            reset( $this->status_list );
+
+            foreach ( $this->status_list as $status => $col ) {
+                if ( 1 == $blog[ $status ] ) {
+                    $class = " class='{$col[0]}'";
+                }
+            }
+
+            echo "<tr{$class}>";
+
+            $this->single_row_columns( $blog );
+
+            echo '</tr>';
+        }
+    }
+
+    /**
+     * Maybe output comma-separated site states.
+     *
+     * @since 5.3.0
+     *
+     * @param array $site
+     */
+    protected function site_states( $site ) {
+        $site_states = array();
+
+        // $site is still an array, so get the object.
+        $_site = WP_Site::get_instance( $site['blog_id'] );
+
+        if ( is_main_site( $_site->id ) ) {
+            $site_states['main'] = __( 'Main' );
+        }
+
+        reset( $this->status_list );
+
+        $site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+        foreach ( $this->status_list as $status => $col ) {
+            if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
+                $site_states[ $col[0] ] = $col[1];
+            }
+        }
+
+        /**
+         * Filters the default site display states for items in the Sites list table.
+         *
+         * @since 5.3.0
+         *
+         * @param string[] $site_states An array of site states. Default 'Main',
+         *                              'Archived', 'Mature', 'Spam', 'Deleted'.
+         * @param WP_Site  $site        The current site object.
+         */
+        $site_states = apply_filters( 'display_site_states', $site_states, $_site );
+
+        if ( ! empty( $site_states ) ) {
+            $state_count = count( $site_states );
+
+            $i = 0;
+
+            echo ' &mdash; ';
+
+            foreach ( $site_states as $state ) {
+                ++$i;
+
+                $sep = ( $i < $state_count ) ? ', ' : '';
+
+                echo "<span class='post-state'>{$state}{$sep}</span>";
+            }
+        }
+    }
+
+    /**
+     * Gets the name of the default primary column.
+     *
+     * @since 4.3.0
+     *
+     * @return string Name of the default primary column, in this case, 'blogname'.
+     */
+    protected function get_default_primary_column_name() {
+        return 'blogname';
+    }
+
+    /**
+     * Generates and displays row action links.
+     *
+     * @since 4.3.0
+     * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param array  $item        Site being acted upon.
+     * @param string $column_name Current column name.
+     * @param string $primary     Primary column name.
+     * @return string Row actions output for sites in Multisite, or an empty string
+     *                if the current column is not the primary column.
+     */
+    protected function handle_row_actions( $item, $column_name, $primary ) {
+        if ( $primary !== $column_name ) {
+            return '';
+        }
+
+        // Restores the more descriptive, specific name for use within this method.
+        $blog     = $item;
+        $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+
+        // Preordered.
+        $actions = array(
+            'edit'       => '',
+            'backend'    => '',
+            'activate'   => '',
+            'deactivate' => '',
+            'archive'    => '',
+            'unarchive'  => '',
+            'spam'       => '',
+            'unspam'     => '',
+            'delete'     => '',
+            'visit'      => '',
+        );
+
+        $actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
+        $actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
+        if ( get_network()->site_id != $blog['blog_id'] ) {
+            if ( '1' == $blog['deleted'] ) {
+                $actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+            } else {
+                $actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+            }
+
+            if ( '1' == $blog['archived'] ) {
+                $actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+            } else {
+                $actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+            }
+
+            if ( '1' == $blog['spam'] ) {
+                $actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+            } else {
+                $actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+            }
+
+            if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
+                $actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
+            }
+        }
+
+        $actions['visit'] = "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
+
+        /**
+         * Filters the action links displayed for each site in the Sites list table.
+         *
+         * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
+         * default for each site. The site's status determines whether to show the
+         * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
+         * 'Not Spam' or 'Spam' link for each site.
+         *
+         * @since 3.1.0
+         *
+         * @param string[] $actions  An array of action links to be displayed.
+         * @param int      $blog_id  The site ID.
+         * @param string   $blogname Site path, formatted depending on whether it is a sub-domain
+         *                           or subdirectory multisite installation.
+         */
+        $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
+
+        return $this->row_actions( $actions );
+    }
 }

Spacing +153 added lines, -153 removed lines

@@ -34,18 +34,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$this->status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) ),
+			'archived' => array('site-archived', __('Archived')),
+			'spam'     => array('site-spammed', _x('Spam', 'site')),
+			'deleted'  => array('site-deleted', __('Deleted')),
+			'mature'   => array('site-mature', __('Mature')),
 		);
 
 		parent::__construct(
 			array(
 				'plural' => 'sites',
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen' => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
 	}
@@ -54,7 +54,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_sites' );
+		return current_user_can('manage_sites');
 	}
 
 	/**
@@ -69,34 +69,34 @@ 
 	public function prepare_items() {
 		global $mode, $s, $wpdb;
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if (!empty($_REQUEST['mode'])) {
 			$mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
-			set_user_setting( 'sites_list_mode', $mode );
+			set_user_setting('sites_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'sites_list_mode', 'list' );
+			$mode = get_user_setting('sites_list_mode', 'list');
 		}
 
-		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
+		$per_page = $this->get_items_per_page('sites_network_per_page');
 
 		$pagenum = $this->get_pagenum();
 
-		$s    = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$s    = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 		$wild = '';
-		if ( false !== strpos( $s, '*' ) ) {
+		if (false !== strpos($s, '*')) {
 			$wild = '*';
-			$s    = trim( $s, '*' );
+			$s    = trim($s, '*');
 		}
 
 		/*
 		 * If the network is large and a search is not being performed, show only
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
-		if ( ! $s && wp_is_large_network() ) {
-			if ( ! isset( $_REQUEST['orderby'] ) ) {
+		if (!$s && wp_is_large_network()) {
+			if (!isset($_REQUEST['orderby'])) {
 				$_GET['orderby']     = '';
 				$_REQUEST['orderby'] = '';
 			}
-			if ( ! isset( $_REQUEST['order'] ) ) {
+			if (!isset($_REQUEST['order'])) {
 				$_GET['order']     = 'DESC';
 				$_REQUEST['order'] = 'DESC';
 			}
@@ -104,66 +104,66 @@ 
 
 		$args = array(
 			'number'     => (int) $per_page,
-			'offset'     => (int) ( ( $pagenum - 1 ) * $per_page ),
+			'offset'     => (int) (($pagenum - 1) * $per_page),
 			'network_id' => get_current_network_id(),
 		);
 
-		if ( empty( $s ) ) {
+		if (empty($s)) {
 			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+		} elseif (preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.$/', $s)) {
 			// IPv4 address.
-			$sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
-			$reg_blog_ids = $wpdb->get_col( $sql );
+			$sql          = $wpdb->prepare("SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like($s) . (!empty($wild) ? '%' : ''));
+			$reg_blog_ids = $wpdb->get_col($sql);
 
-			if ( $reg_blog_ids ) {
+			if ($reg_blog_ids) {
 				$args['site__in'] = $reg_blog_ids;
 			}
-		} elseif ( is_numeric( $s ) && empty( $wild ) ) {
+		} elseif (is_numeric($s) && empty($wild)) {
 			$args['ID'] = $s;
 		} else {
 			$args['search'] = $s;
 
-			if ( ! is_subdomain_install() ) {
-				$args['search_columns'] = array( 'path' );
+			if (!is_subdomain_install()) {
+				$args['search_columns'] = array('path');
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( 'registered' === $order_by ) {
+		$order_by = isset($_REQUEST['orderby']) ? $_REQUEST['orderby'] : '';
+		if ('registered' === $order_by) {
 			// 'registered' is a valid field name.
-		} elseif ( 'lastupdated' === $order_by ) {
+		} elseif ('lastupdated' === $order_by) {
 			$order_by = 'last_updated';
-		} elseif ( 'blogname' === $order_by ) {
-			if ( is_subdomain_install() ) {
+		} elseif ('blogname' === $order_by) {
+			if (is_subdomain_install()) {
 				$order_by = 'domain';
 			} else {
 				$order_by = 'path';
 			}
-		} elseif ( 'blog_id' === $order_by ) {
+		} elseif ('blog_id' === $order_by) {
 			$order_by = 'id';
-		} elseif ( ! $order_by ) {
+		} elseif (!$order_by) {
 			$order_by = false;
 		}
 
 		$args['orderby'] = $order_by;
 
-		if ( $order_by ) {
-			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
+		if ($order_by) {
+			$args['order'] = (isset($_REQUEST['order']) && 'DESC' === strtoupper($_REQUEST['order'])) ? 'DESC' : 'ASC';
 		}
 
-		if ( wp_is_large_network() ) {
+		if (wp_is_large_network()) {
 			$args['no_found_rows'] = true;
 		} else {
 			$args['no_found_rows'] = false;
 		}
 
 		// Take into account the role the user has selected.
-		$status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
-		if ( in_array( $status, array( 'public', 'archived', 'mature', 'spam', 'deleted' ), true ) ) {
-			$args[ $status ] = 1;
+		$status = isset($_REQUEST['status']) ? wp_unslash(trim($_REQUEST['status'])) : '';
+		if (in_array($status, array('public', 'archived', 'mature', 'spam', 'deleted'), true)) {
+			$args[$status] = 1;
 		}
 
 		/**
@@ -173,13 +173,13 @@ 
 		 *
 		 * @param array $args An array of get_sites() arguments.
 		 */
-		$args = apply_filters( 'ms_sites_list_table_query_args', $args );
+		$args = apply_filters('ms_sites_list_table_query_args', $args);
 
-		$_sites = get_sites( $args );
-		if ( is_array( $_sites ) ) {
-			update_site_cache( $_sites );
+		$_sites = get_sites($args);
+		if (is_array($_sites)) {
+			update_site_cache($_sites);
 
-			$this->items = array_slice( $_sites, 0, $per_page );
+			$this->items = array_slice($_sites, 0, $per_page);
 		}
 
 		$total_sites = get_sites(
@@ -204,7 +204,7 @@ 
 	/**
 	 */
 	public function no_items() {
-		_e( 'No sites found.' );
+		_e('No sites found.');
 	}
 
 	/**
@@ -258,20 +258,20 @@ 
 		);
 
 		$view_links       = array();
-		$requested_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+		$requested_status = isset($_REQUEST['status']) ? wp_unslash(trim($_REQUEST['status'])) : '';
 		$url              = 'sites.php';
 
-		foreach ( $statuses as $status => $label_count ) {
-			$current_link_attributes = $requested_status === $status || ( '' === $requested_status && 'all' === $status )
+		foreach ($statuses as $status => $label_count) {
+			$current_link_attributes = $requested_status === $status || ('' === $requested_status && 'all' === $status)
 				? ' class="current" aria-current="page"'
 				: '';
-			if ( (int) $counts[ $status ] > 0 ) {
-				$label    = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
-				$full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
+			if ((int) $counts[$status] > 0) {
+				$label    = sprintf(translate_nooped_plural($label_count, $counts[$status]), number_format_i18n($counts[$status]));
+				$full_url = 'all' === $status ? $url : add_query_arg('status', $status, $url);
 
-				$view_links[ $status ] = sprintf(
+				$view_links[$status] = sprintf(
 					'<a href="%1$s"%2$s>%3$s</a>',
-					esc_url( $full_url ),
+					esc_url($full_url),
 					$current_link_attributes,
 					$label
 				);
@@ -286,11 +286,11 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) ) {
-			$actions['delete'] = __( 'Delete' );
+		if (current_user_can('delete_sites')) {
+			$actions['delete'] = __('Delete');
 		}
-		$actions['spam']    = _x( 'Mark as spam', 'site' );
-		$actions['notspam'] = _x( 'Not spam', 'site' );
+		$actions['spam']    = _x('Mark as spam', 'site');
+		$actions['notspam'] = _x('Not spam', 'site');
 
 		return $actions;
 	}
@@ -300,13 +300,13 @@ 
 	 *
 	 * @param string $which The location of the pagination nav markup: 'top' or 'bottom'.
 	 */
-	protected function pagination( $which ) {
+	protected function pagination($which) {
 		global $mode;
 
-		parent::pagination( $which );
+		parent::pagination($which);
 
-		if ( 'top' === $which ) {
-			$this->view_switcher( $mode );
+		if ('top' === $which) {
+			$this->view_switcher($mode);
 		}
 	}
 
@@ -317,11 +317,11 @@ 
 	 *
 	 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		?>
 		<div class="alignleft actions">
 		<?php
-		if ( 'top' === $which ) {
+		if ('top' === $which) {
 			ob_start();
 
 			/**
@@ -331,13 +331,13 @@ 
 			 *
 			 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 			 */
-			do_action( 'restrict_manage_sites', $which );
+			do_action('restrict_manage_sites', $which);
 
 			$output = ob_get_clean();
 
-			if ( ! empty( $output ) ) {
+			if (!empty($output)) {
 				echo $output;
-				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'site-query-submit' ) );
+				submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'site-query-submit'));
 			}
 		}
 		?>
@@ -351,7 +351,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_sites_extra_tablenav', $which );
+		do_action('manage_sites_extra_tablenav', $which);
 	}
 
 	/**
@@ -360,14 +360,14 @@ 
 	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'blogname'    => __( 'URL' ),
-			'lastupdated' => __( 'Last Updated' ),
-			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' ),
+			'blogname'    => __('URL'),
+			'lastupdated' => __('Last Updated'),
+			'registered'  => _x('Registered', 'site'),
+			'users'       => __('Users'),
 		);
 
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			$sites_columns['plugins'] = __( 'Actions' );
+		if (has_filter('wpmublogsaction')) {
+			$sites_columns['plugins'] = __('Actions');
 		}
 
 		/**
@@ -378,7 +378,7 @@ 
 		 * @param string[] $sites_columns An array of displayed site columns. Default 'cb',
 		 *                               'blogname', 'lastupdated', 'registered', 'users'.
 		 */
-		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
+		return apply_filters('wpmu_blogs_columns', $sites_columns);
 	}
 
 	/**
@@ -400,20 +400,20 @@ 
 	 *
 	 * @param array $item Current site.
 	 */
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		// Restores the more descriptive, specific name for use within this method.
 		$blog = $item;
 
-		if ( ! is_main_site( $blog['blog_id'] ) ) :
-			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		if (!is_main_site($blog['blog_id'])) :
+			$blogname = untrailingslashit($blog['domain'] . $blog['path']);
 			?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
 				<?php
 				/* translators: %s: Site URL. */
-				printf( __( 'Select %s' ), $blogname );
+				printf(__('Select %s'), $blogname);
 				?>
 			</label>
-			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr($blog['blog_id']); ?>" />
 			<?php
 		endif;
 	}
@@ -425,7 +425,7 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_id( $blog ) {
+	public function column_id($blog) {
 		echo $blog['blog_id'];
 	}
 
@@ -438,25 +438,25 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_blogname( $blog ) {
+	public function column_blogname($blog) {
 		global $mode;
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'] . $blog['path']);
 
 		?>
 		<strong>
-			<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname; ?></a>
-			<?php $this->site_states( $blog ); ?>
+			<a href="<?php echo esc_url(network_admin_url('site-info.php?id=' . $blog['blog_id'])); ?>" class="edit"><?php echo $blogname; ?></a>
+			<?php $this->site_states($blog); ?>
 		</strong>
 		<?php
-		if ( 'list' !== $mode ) {
-			switch_to_blog( $blog['blog_id'] );
+		if ('list' !== $mode) {
+			switch_to_blog($blog['blog_id']);
 			echo '<p>';
 			printf(
 				/* translators: 1: Site title, 2: Site tagline. */
-				__( '%1$s &#8211; %2$s' ),
-				get_option( 'blogname' ),
-				'<em>' . get_option( 'blogdescription' ) . '</em>'
+				__('%1$s &#8211; %2$s'),
+				get_option('blogname'),
+				'<em>' . get_option('blogdescription') . '</em>'
 			);
 			echo '</p>';
 			restore_current_blog();
@@ -472,16 +472,16 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_lastupdated( $blog ) {
+	public function column_lastupdated($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		echo ( '0000-00-00 00:00:00' === $blog['last_updated'] ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+		echo ('0000-00-00 00:00:00' === $blog['last_updated']) ? __('Never') : mysql2date($date, $blog['last_updated']);
 	}
 
 	/**
@@ -493,19 +493,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_registered( $blog ) {
+	public function column_registered($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		if ( '0000-00-00 00:00:00' === $blog['registered'] ) {
+		if ('0000-00-00 00:00:00' === $blog['registered']) {
 			echo '&#x2014;';
 		} else {
-			echo mysql2date( $date, $blog['registered'] );
+			echo mysql2date($date, $blog['registered']);
 		}
 	}
 
@@ -516,9 +516,9 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_users( $blog ) {
-		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
-		if ( ! $user_count ) {
+	public function column_users($blog) {
+		$user_count = wp_cache_get($blog['blog_id'] . '_user_count', 'blog-details');
+		if (!$user_count) {
 			$blog_users = new WP_User_Query(
 				array(
 					'blog_id'     => $blog['blog_id'],
@@ -528,13 +528,13 @@ 
 				)
 			);
 			$user_count = $blog_users->get_total();
-			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+			wp_cache_set($blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS);
 		}
 
 		printf(
 			'<a href="%s">%s</a>',
-			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
-			number_format_i18n( $user_count )
+			esc_url(network_admin_url('site-users.php?id=' . $blog['blog_id'])),
+			number_format_i18n($user_count)
 		);
 	}
 
@@ -545,8 +545,8 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_plugins( $blog ) {
-		if ( has_filter( 'wpmublogsaction' ) ) {
+	public function column_plugins($blog) {
+		if (has_filter('wpmublogsaction')) {
 			/**
 			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
 			 *
@@ -556,7 +556,7 @@ 
 			 *
 			 * @param int $blog_id The site ID.
 			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
+			do_action('wpmublogsaction', $blog['blog_id']);
 		}
 	}
 
@@ -569,7 +569,7 @@ 
 	 * @param array  $item        Current site.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Fires for each registered custom column in the Sites list table.
 		 *
@@ -578,27 +578,27 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $blog_id     The site ID.
 		 */
-		do_action( 'manage_sites_custom_column', $column_name, $item['blog_id'] );
+		do_action('manage_sites_custom_column', $column_name, $item['blog_id']);
 	}
 
 	/**
 	 * @global string $mode List table view mode.
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $blog ) {
+		foreach ($this->items as $blog) {
 			$blog  = $blog->to_array();
 			$class = '';
-			reset( $this->status_list );
+			reset($this->status_list);
 
-			foreach ( $this->status_list as $status => $col ) {
-				if ( 1 == $blog[ $status ] ) {
+			foreach ($this->status_list as $status => $col) {
+				if (1 == $blog[$status]) {
 					$class = " class='{$col[0]}'";
 				}
 			}
 
 			echo "<tr{$class}>";
 
-			$this->single_row_columns( $blog );
+			$this->single_row_columns($blog);
 
 			echo '</tr>';
 		}
@@ -611,22 +611,22 @@ 
 	 *
 	 * @param array $site
 	 */
-	protected function site_states( $site ) {
+	protected function site_states($site) {
 		$site_states = array();
 
 		// $site is still an array, so get the object.
-		$_site = WP_Site::get_instance( $site['blog_id'] );
+		$_site = WP_Site::get_instance($site['blog_id']);
 
-		if ( is_main_site( $_site->id ) ) {
-			$site_states['main'] = __( 'Main' );
+		if (is_main_site($_site->id)) {
+			$site_states['main'] = __('Main');
 		}
 
-		reset( $this->status_list );
+		reset($this->status_list);
 
-		$site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
-		foreach ( $this->status_list as $status => $col ) {
-			if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
-				$site_states[ $col[0] ] = $col[1];
+		$site_status = isset($_REQUEST['status']) ? wp_unslash(trim($_REQUEST['status'])) : '';
+		foreach ($this->status_list as $status => $col) {
+			if ((1 === (int) $_site->{$status} ) && ($site_status !== $status)) {
+				$site_states[$col[0]] = $col[1];
 			}
 		}
 
@@ -639,19 +639,19 @@ 
 		 *                              'Archived', 'Mature', 'Spam', 'Deleted'.
 		 * @param WP_Site  $site        The current site object.
 		 */
-		$site_states = apply_filters( 'display_site_states', $site_states, $_site );
+		$site_states = apply_filters('display_site_states', $site_states, $_site);
 
-		if ( ! empty( $site_states ) ) {
-			$state_count = count( $site_states );
+		if (!empty($site_states)) {
+			$state_count = count($site_states);
 
 			$i = 0;
 
 			echo ' &mdash; ';
 
-			foreach ( $site_states as $state ) {
+			foreach ($site_states as $state) {
 				++$i;
 
-				$sep = ( $i < $state_count ) ? ', ' : '';
+				$sep = ($i < $state_count) ? ', ' : '';
 
 				echo "<span class='post-state'>{$state}{$sep}</span>";
 			}
@@ -681,14 +681,14 @@ 
 	 * @return string Row actions output for sites in Multisite, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($item, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		// Restores the more descriptive, specific name for use within this method.
 		$blog     = $item;
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'] . $blog['path']);
 
 		// Preordered.
 		$actions = array(
@@ -704,33 +704,33 @@ 
 			'visit'      => '',
 		);
 
-		$actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-		if ( get_network()->site_id != $blog['blog_id'] ) {
-			if ( '1' == $blog['deleted'] ) {
-				$actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+		$actions['edit']    = '<a href="' . esc_url(network_admin_url('site-info.php?id=' . $blog['blog_id'])) . '">' . __('Edit') . '</a>';
+		$actions['backend'] = "<a href='" . esc_url(get_admin_url($blog['blog_id'])) . "' class='edit'>" . __('Dashboard') . '</a>';
+		if (get_network()->site_id != $blog['blog_id']) {
+			if ('1' == $blog['deleted']) {
+				$actions['activate'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id']), 'activateblog_' . $blog['blog_id'])) . '">' . __('Activate') . '</a>';
 			} else {
-				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+				$actions['deactivate'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id']), 'deactivateblog_' . $blog['blog_id'])) . '">' . __('Deactivate') . '</a>';
 			}
 
-			if ( '1' == $blog['archived'] ) {
-				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+			if ('1' == $blog['archived']) {
+				$actions['unarchive'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id']), 'unarchiveblog_' . $blog['blog_id'])) . '">' . __('Unarchive') . '</a>';
 			} else {
-				$actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+				$actions['archive'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id']), 'archiveblog_' . $blog['blog_id'])) . '">' . _x('Archive', 'verb; site') . '</a>';
 			}
 
-			if ( '1' == $blog['spam'] ) {
-				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+			if ('1' == $blog['spam']) {
+				$actions['unspam'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id']), 'unspamblog_' . $blog['blog_id'])) . '">' . _x('Not Spam', 'site') . '</a>';
 			} else {
-				$actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+				$actions['spam'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id']), 'spamblog_' . $blog['blog_id'])) . '">' . _x('Spam', 'site') . '</a>';
 			}
 
-			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
+			if (current_user_can('delete_site', $blog['blog_id'])) {
+				$actions['delete'] = '<a href="' . esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id']), 'deleteblog_' . $blog['blog_id'])) . '">' . __('Delete') . '</a>';
 			}
 		}
 
-		$actions['visit'] = "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = "<a href='" . esc_url(get_home_url($blog['blog_id'], '/')) . "' rel='bookmark'>" . __('Visit') . '</a>';
 
 		/**
 		 * Filters the action links displayed for each site in the Sites list table.
@@ -747,8 +747,8 @@ 
 		 * @param string   $blogname Site path, formatted depending on whether it is a sub-domain
 		 *                           or subdirectory multisite installation.
 		 */
-		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
+		$actions = apply_filters('manage_sites_action_links', array_filter($actions), $blog['blog_id'], $blogname);
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 }

brighty/wp-admin/includes/deprecated.php

Indentation +628 added lines, -628 removed lines

@@ -18,9 +18,9 @@ 
  * @see wp_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_editor()' );
+    _deprecated_function( __FUNCTION__, '2.1.0', 'wp_editor()' );
 
-	wp_tiny_mce();
+    wp_tiny_mce();
 }
 
 /**
@@ -31,7 +31,7 @@ 
  *
  */
 function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+    _deprecated_function( __FUNCTION__, '2.5.0' );
 }
 
 /**
@@ -48,8 +48,8 @@ 
  * @return array Shrunk dimensions (width, height).
  */
 function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'wp_constrain_dimensions()' );
+    return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
 }
 
 /**
@@ -64,8 +64,8 @@ 
  * @return array Shrunk dimensions (width, height).
  */
 function get_udims( $width, $height ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, 128, 96 );
+    _deprecated_function( __FUNCTION__, '3.5.0', 'wp_constrain_dimensions()' );
+    return wp_constrain_dimensions( $width, $height, 128, 96 );
 }
 
 /**
@@ -82,9 +82,9 @@ 
  * @param array $popular_ids      Unused.
  */
 function dropdown_categories( $default_category = 0, $category_parent = 0, $popular_ids = array() ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' );
-	global $post_ID;
-	wp_category_checklist( $post_ID );
+    _deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' );
+    global $post_ID;
+    wp_category_checklist( $post_ID );
 }
 
 /**
@@ -99,9 +99,9 @@ 
  * @param int $default_link_category Unused.
  */
 function dropdown_link_categories( $default_link_category = 0 ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_link_category_checklist()' );
-	global $link_id;
-	wp_link_category_checklist( $link_id );
+    _deprecated_function( __FUNCTION__, '2.6.0', 'wp_link_category_checklist()' );
+    global $link_id;
+    wp_link_category_checklist( $link_id );
 }
 
 /**
@@ -115,9 +115,9 @@ 
  * @return string Full filesystem path to edit.
  */
 function get_real_file_to_edit( $file ) {
-	_deprecated_function( __FUNCTION__, '2.9.0' );
+    _deprecated_function( __FUNCTION__, '2.9.0' );
 
-	return WP_CONTENT_DIR . $file;
+    return WP_CONTENT_DIR . $file;
 }
 
 /**
@@ -135,25 +135,25 @@ 
  * @return void|false Void on success, false if no categories were found.
  */
 function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
-
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $current_cat != $category->term_id && $category_parent == $category->parent) {
-				$pad = str_repeat( '– ', $level );
-				$category->name = esc_html( $category->name );
-				echo "\n\t<option value='$category->term_id'";
-				if ( $current_parent == $category->term_id )
-					echo " selected='selected'";
-				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $current_cat, $current_parent, $category->term_id, $level +1, $categories );
-			}
-		}
-	} else {
-		return false;
-	}
+    _deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
+    if (!$categories )
+        $categories = get_categories( array('hide_empty' => 0) );
+
+    if ( $categories ) {
+        foreach ( $categories as $category ) {
+            if ( $current_cat != $category->term_id && $category_parent == $category->parent) {
+                $pad = str_repeat( '&#8211; ', $level );
+                $category->name = esc_html( $category->name );
+                echo "\n\t<option value='$category->term_id'";
+                if ( $current_parent == $category->term_id )
+                    echo " selected='selected'";
+                echo ">$pad$category->name</option>";
+                wp_dropdown_cats( $current_cat, $current_parent, $category->term_id, $level +1, $categories );
+            }
+        }
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -170,8 +170,8 @@ 
  * @param callable $sanitize_callback Optional. A callback function that sanitizes the option's value.
  */
 function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'register_setting()' );
-	register_setting( $option_group, $option_name, $sanitize_callback );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'register_setting()' );
+    register_setting( $option_group, $option_name, $sanitize_callback );
 }
 
 /**
@@ -186,8 +186,8 @@ 
  * @param callable $sanitize_callback Optional. Deprecated.
  */
 function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'unregister_setting()' );
-	unregister_setting( $option_group, $option_name, $sanitize_callback );
+    _deprecated_function( __FUNCTION__, '3.0.0', 'unregister_setting()' );
+    unregister_setting( $option_group, $option_name, $sanitize_callback );
 }
 
 /**
@@ -199,7 +199,7 @@ 
  * @param string $filename
 **/
 function codepress_get_lang( $filename ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+    _deprecated_function( __FUNCTION__, '3.0.0' );
 }
 
 /**
@@ -209,7 +209,7 @@ 
  * @deprecated 3.0.0
 **/
 function codepress_footer_js() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+    _deprecated_function( __FUNCTION__, '3.0.0' );
 }
 
 /**
@@ -219,7 +219,7 @@ 
  * @deprecated 3.0.0
 **/
 function use_codepress() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+    _deprecated_function( __FUNCTION__, '3.0.0' );
 }
 
 /**
@@ -232,15 +232,15 @@ 
  * @return array List of user IDs.
  */
 function get_author_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+    _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+    global $wpdb;
+    if ( !is_multisite() )
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    else
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
+    return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
 
 /**
@@ -254,20 +254,20 @@ 
  * @return array|false List of editable authors. False if no editable users.
  */
 function get_editable_authors( $user_id ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+    _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-	global $wpdb;
+    global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+    $editable = get_editable_user_ids( $user_id );
 
-	if ( !$editable ) {
-		return false;
-	} else {
-		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
-	}
+    if ( !$editable ) {
+        return false;
+    } else {
+        $editable = join(',', $editable);
+        $authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+    }
 
-	return apply_filters('get_editable_authors', $authors);
+    return apply_filters('get_editable_authors', $authors);
 }
 
 /**
@@ -282,31 +282,31 @@ 
  * @return array Array of editable user IDs, empty array otherwise.
  */
 function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+    _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-	global $wpdb;
+    global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
-	$post_type_obj = get_post_type_object($post_type);
+    if ( ! $user = get_userdata( $user_id ) )
+        return array();
+    $post_type_obj = get_post_type_object($post_type);
 
-	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
-	}
+    if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
+        if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
+            return array($user->ID);
+        else
+            return array();
+    }
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+    if ( !is_multisite() )
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    else
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
-	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+    $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
+    if ( $exclude_zeros )
+        $query .= " AND meta_value != '0'";
 
-	return $wpdb->get_col( $query );
+    return $wpdb->get_col( $query );
 }
 
 /**
@@ -317,16 +317,16 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  */
 function get_nonauthor_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+    _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-	global $wpdb;
+    global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+    if ( !is_multisite() )
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    else
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
+    return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
 
 if ( ! class_exists( 'WP_User_Search', false ) ) :
@@ -338,337 +338,337 @@ 
  */
 class WP_User_Search {
 
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var mixed
-	 */
-	var $results;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var string
-	 */
-	var $search_term;
-
-	/**
-	 * Page number.
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var int
-	 */
-	var $page;
-
-	/**
-	 * Role name that users have.
-	 *
-	 * @since 2.5.0
-	 * @access private
-	 * @var string
-	 */
-	var $role;
-
-	/**
-	 * Raw page number.
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var int|bool
-	 */
-	var $raw_page;
-
-	/**
-	 * Amount of users to display per page.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 * @var int
-	 */
-	var $users_per_page = 50;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var int
-	 */
-	var $first_user;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var int
-	 */
-	var $last_user;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_limit;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_orderby;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_from;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_where;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var int
-	 */
-	var $total_users_for_query = 0;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var bool
-	 */
-	var $too_many_total_users = false;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.1.0
-	 * @access private
-	 * @var WP_Error
-	 */
-	var $search_errors;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 2.7.0
-	 * @access private
-	 * @var string
-	 */
-	var $paging_text;
-
-	/**
-	 * PHP5 Constructor - Sets up the object properties.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $search_term Search terms string.
-	 * @param int $page Optional. Page ID.
-	 * @param string $role Role name.
-	 * @return WP_User_Search
-	 */
-	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1.0', 'WP_User_Query' );
-
-		$this->search_term = wp_unslash( $search_term );
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = ( '' == $page ) ? 1 : (int) $page;
-		$this->role = $role;
-
-		$this->prepare_query();
-		$this->query();
-		$this->do_paging();
-	}
-
-	/**
-	 * PHP4 Constructor - Sets up the object properties.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $search_term Search terms string.
-	 * @param int $page Optional. Page ID.
-	 * @param string $role Role name.
-	 * @return WP_User_Search
-	 */
-	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
-		self::__construct( $search_term, $page, $role );
-	}
-
-	/**
-	 * Prepares the user search query (legacy).
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 */
-	public function prepare_query() {
-		global $wpdb;
-		$this->first_user = ($this->page - 1) * $this->users_per_page;
-
-		$this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $this->first_user, $this->users_per_page);
-		$this->query_orderby = ' ORDER BY user_login';
-
-		$search_sql = '';
-		if ( $this->search_term ) {
-			$searches = array();
-			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
-			$search_sql .= implode(' OR ', $searches);
-			$search_sql .= ')';
-		}
-
-		$this->query_from = " FROM $wpdb->users";
-		$this->query_where = " WHERE 1=1 $search_sql";
-
-		if ( $this->role ) {
-			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
-			$level_key = $wpdb->prefix . 'capabilities'; // WPMU site admins don't have user_levels.
-			$this->query_from .= ", $wpdb->usermeta";
-			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
-		}
-
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
-	}
-
-	/**
-	 * Executes the user search query.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 */
-	public function query() {
-		global $wpdb;
-
-		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
-
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // No limit.
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
-	}
-
-	/**
-	 * Prepares variables for use in templates.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 */
-	function prepare_vars_for_template_usage() {}
-
-	/**
-	 * Handles paging for the user search query.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 */
-	public function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results.
-			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
-
-			$this->paging_text = paginate_links( array(
-				'total' => ceil($this->total_users_for_query / $this->users_per_page),
-				'current' => $this->page,
-				'base' => 'users.php?%_%',
-				'format' => 'userspage=%#%',
-				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
-				$this->paging_text = sprintf(
-					/* translators: 1: Starting number of users on the current page, 2: Ending number of users, 3: Total number of users. */
-					'<span class="displaying-num">' . __( 'Displaying %1$s&#8211;%2$s of %3$s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
-					$this->paging_text
-				);
-			}
-		}
-	}
-
-	/**
-	 * Retrieves the user search query results.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 *
-	 * @return array
-	 */
-	public function get_results() {
-		return (array) $this->results;
-	}
-
-	/**
-	 * Displaying paging text.
-	 *
-	 * @see do_paging() Builds paging text.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 */
-	function page_links() {
-		echo $this->paging_text;
-	}
-
-	/**
-	 * Whether paging is enabled.
-	 *
-	 * @see do_paging() Builds paging text.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 *
-	 * @return bool
-	 */
-	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
-		return false;
-	}
-
-	/**
-	 * Whether there are search terms.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 *
-	 * @return bool
-	 */
-	function is_search() {
-		if ( $this->search_term )
-			return true;
-		return false;
-	}
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var mixed
+     */
+    var $results;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var string
+     */
+    var $search_term;
+
+    /**
+     * Page number.
+     *
+     * @since 2.1.0
+     * @access private
+     * @var int
+     */
+    var $page;
+
+    /**
+     * Role name that users have.
+     *
+     * @since 2.5.0
+     * @access private
+     * @var string
+     */
+    var $role;
+
+    /**
+     * Raw page number.
+     *
+     * @since 2.1.0
+     * @access private
+     * @var int|bool
+     */
+    var $raw_page;
+
+    /**
+     * Amount of users to display per page.
+     *
+     * @since 2.1.0
+     * @access public
+     * @var int
+     */
+    var $users_per_page = 50;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var int
+     */
+    var $first_user;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var int
+     */
+    var $last_user;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var string
+     */
+    var $query_limit;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 3.0.0
+     * @access private
+     * @var string
+     */
+    var $query_orderby;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 3.0.0
+     * @access private
+     * @var string
+     */
+    var $query_from;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 3.0.0
+     * @access private
+     * @var string
+     */
+    var $query_where;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var int
+     */
+    var $total_users_for_query = 0;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var bool
+     */
+    var $too_many_total_users = false;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.1.0
+     * @access private
+     * @var WP_Error
+     */
+    var $search_errors;
+
+    /**
+     * {@internal Missing Description}}
+     *
+     * @since 2.7.0
+     * @access private
+     * @var string
+     */
+    var $paging_text;
+
+    /**
+     * PHP5 Constructor - Sets up the object properties.
+     *
+     * @since 2.1.0
+     *
+     * @param string $search_term Search terms string.
+     * @param int $page Optional. Page ID.
+     * @param string $role Role name.
+     * @return WP_User_Search
+     */
+    function __construct( $search_term = '', $page = '', $role = '' ) {
+        _deprecated_function( __FUNCTION__, '3.1.0', 'WP_User_Query' );
+
+        $this->search_term = wp_unslash( $search_term );
+        $this->raw_page = ( '' == $page ) ? false : (int) $page;
+        $this->page = ( '' == $page ) ? 1 : (int) $page;
+        $this->role = $role;
+
+        $this->prepare_query();
+        $this->query();
+        $this->do_paging();
+    }
+
+    /**
+     * PHP4 Constructor - Sets up the object properties.
+     *
+     * @since 2.1.0
+     *
+     * @param string $search_term Search terms string.
+     * @param int $page Optional. Page ID.
+     * @param string $role Role name.
+     * @return WP_User_Search
+     */
+    public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
+        self::__construct( $search_term, $page, $role );
+    }
+
+    /**
+     * Prepares the user search query (legacy).
+     *
+     * @since 2.1.0
+     * @access public
+     */
+    public function prepare_query() {
+        global $wpdb;
+        $this->first_user = ($this->page - 1) * $this->users_per_page;
+
+        $this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $this->first_user, $this->users_per_page);
+        $this->query_orderby = ' ORDER BY user_login';
+
+        $search_sql = '';
+        if ( $this->search_term ) {
+            $searches = array();
+            $search_sql = 'AND (';
+            foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
+                $searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+            $search_sql .= implode(' OR ', $searches);
+            $search_sql .= ')';
+        }
+
+        $this->query_from = " FROM $wpdb->users";
+        $this->query_where = " WHERE 1=1 $search_sql";
+
+        if ( $this->role ) {
+            $this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
+            $this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
+        } elseif ( is_multisite() ) {
+            $level_key = $wpdb->prefix . 'capabilities'; // WPMU site admins don't have user_levels.
+            $this->query_from .= ", $wpdb->usermeta";
+            $this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
+        }
+
+        do_action_ref_array( 'pre_user_search', array( &$this ) );
+    }
+
+    /**
+     * Executes the user search query.
+     *
+     * @since 2.1.0
+     * @access public
+     */
+    public function query() {
+        global $wpdb;
+
+        $this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+
+        if ( $this->results )
+            $this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // No limit.
+        else
+            $this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+    }
+
+    /**
+     * Prepares variables for use in templates.
+     *
+     * @since 2.1.0
+     * @access public
+     */
+    function prepare_vars_for_template_usage() {}
+
+    /**
+     * Handles paging for the user search query.
+     *
+     * @since 2.1.0
+     * @access public
+     */
+    public function do_paging() {
+        if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results.
+            $args = array();
+            if ( ! empty($this->search_term) )
+                $args['usersearch'] = urlencode($this->search_term);
+            if ( ! empty($this->role) )
+                $args['role'] = urlencode($this->role);
+
+            $this->paging_text = paginate_links( array(
+                'total' => ceil($this->total_users_for_query / $this->users_per_page),
+                'current' => $this->page,
+                'base' => 'users.php?%_%',
+                'format' => 'userspage=%#%',
+                'add_args' => $args
+            ) );
+            if ( $this->paging_text ) {
+                $this->paging_text = sprintf(
+                    /* translators: 1: Starting number of users on the current page, 2: Ending number of users, 3: Total number of users. */
+                    '<span class="displaying-num">' . __( 'Displaying %1$s&#8211;%2$s of %3$s' ) . '</span>%s',
+                    number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
+                    number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
+                    number_format_i18n( $this->total_users_for_query ),
+                    $this->paging_text
+                );
+            }
+        }
+    }
+
+    /**
+     * Retrieves the user search query results.
+     *
+     * @since 2.1.0
+     * @access public
+     *
+     * @return array
+     */
+    public function get_results() {
+        return (array) $this->results;
+    }
+
+    /**
+     * Displaying paging text.
+     *
+     * @see do_paging() Builds paging text.
+     *
+     * @since 2.1.0
+     * @access public
+     */
+    function page_links() {
+        echo $this->paging_text;
+    }
+
+    /**
+     * Whether paging is enabled.
+     *
+     * @see do_paging() Builds paging text.
+     *
+     * @since 2.1.0
+     * @access public
+     *
+     * @return bool
+     */
+    function results_are_paged() {
+        if ( $this->paging_text )
+            return true;
+        return false;
+    }
+
+    /**
+     * Whether there are search terms.
+     *
+     * @since 2.1.0
+     * @access public
+     *
+     * @return bool
+     */
+    function is_search() {
+        if ( $this->search_term )
+            return true;
+        return false;
+    }
 }
 endif;
 
@@ -687,27 +687,27 @@ 
  * @return array List of posts from others.
  */
 function get_others_unpublished_posts( $user_id, $type = 'any' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+    _deprecated_function( __FUNCTION__, '3.1.0' );
 
-	global $wpdb;
+    global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+    $editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+    if ( in_array($type, array('draft', 'pending')) )
+        $type_sql = " post_status = '$type' ";
+    else
+        $type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
 
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
+    $dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
-	if ( !$editable ) {
-		$other_unpubs = '';
-	} else {
-		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
-	}
+    if ( !$editable ) {
+        $other_unpubs = '';
+    } else {
+        $editable = join(',', $editable);
+        $other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
+    }
 
-	return apply_filters('get_others_drafts', $other_unpubs);
+    return apply_filters('get_others_drafts', $other_unpubs);
 }
 
 /**
@@ -720,9 +720,9 @@ 
  * @return array List of drafts from other users.
  */
 function get_others_drafts($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+    _deprecated_function( __FUNCTION__, '3.1.0' );
 
-	return get_others_unpublished_posts($user_id, 'draft');
+    return get_others_unpublished_posts($user_id, 'draft');
 }
 
 /**
@@ -735,9 +735,9 @@ 
  * @return array List of posts with pending review post type from other users.
  */
 function get_others_pending($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+    _deprecated_function( __FUNCTION__, '3.1.0' );
 
-	return get_others_unpublished_posts($user_id, 'pending');
+    return get_others_unpublished_posts($user_id, 'pending');
 }
 
 /**
@@ -748,8 +748,8 @@ 
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()' );
-	wp_dashboard_quick_press();
+    _deprecated_function( __FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()' );
+    wp_dashboard_quick_press();
 }
 
 /**
@@ -760,23 +760,23 @@ 
  * @see wp_editor()
  */
 function wp_tiny_mce( $teeny = false, $settings = false ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
 
-	static $num = 1;
+    static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once ABSPATH . WPINC . '/class-wp-editor.php';
+    if ( ! class_exists( '_WP_Editors', false ) )
+        require_once ABSPATH . WPINC . '/class-wp-editor.php';
 
-	$editor_id = 'content' . $num++;
+    $editor_id = 'content' . $num++;
 
-	$set = array(
-		'teeny' => $teeny,
-		'tinymce' => $settings ? $settings : true,
-		'quicktags' => false
-	);
+    $set = array(
+        'teeny' => $teeny,
+        'tinymce' => $settings ? $settings : true,
+        'quicktags' => false
+    );
 
-	$set = _WP_Editors::parse_settings($editor_id, $set);
-	_WP_Editors::editor_settings($editor_id, $set);
+    $set = _WP_Editors::parse_settings($editor_id, $set);
+    _WP_Editors::editor_settings($editor_id, $set);
 }
 
 /**
@@ -786,7 +786,7 @@ 
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
 }
 
 /**
@@ -796,7 +796,7 @@ 
  * @see wp_editor()
  */
 function wp_print_editor_js() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
 }
 
 /**
@@ -806,7 +806,7 @@ 
  * @see wp_editor()
  */
 function wp_quicktags() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
 }
 
 /**
@@ -817,16 +817,16 @@ 
  * @see WP_Screen::render_screen_layout()
  */
 function screen_layout( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()' );
 
-	$current_screen = get_current_screen();
+    $current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+    if ( ! $current_screen )
+        return '';
 
-	ob_start();
-	$current_screen->render_screen_layout();
-	return ob_get_clean();
+    ob_start();
+    $current_screen->render_screen_layout();
+    return ob_get_clean();
 }
 
 /**
@@ -837,16 +837,16 @@ 
  * @see WP_Screen::render_per_page_options()
  */
 function screen_options( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()' );
 
-	$current_screen = get_current_screen();
+    $current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+    if ( ! $current_screen )
+        return '';
 
-	ob_start();
-	$current_screen->render_per_page_options();
-	return ob_get_clean();
+    ob_start();
+    $current_screen->render_per_page_options();
+    return ob_get_clean();
 }
 
 /**
@@ -857,8 +857,8 @@ 
  * @see WP_Screen::render_screen_meta()
  */
 function screen_meta( $screen ) {
-	$current_screen = get_current_screen();
-	$current_screen->render_screen_meta();
+    $current_screen = get_current_screen();
+    $current_screen->render_screen_meta();
 }
 
 /**
@@ -869,7 +869,7 @@ 
  * @see WP_Admin_Bar
  */
 function favorite_actions() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'WP_Admin_Bar' );
+    _deprecated_function( __FUNCTION__, '3.2.0', 'WP_Admin_Bar' );
 }
 
 /**
@@ -881,8 +881,8 @@ 
  * @return null|string
  */
 function media_upload_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
-	return wp_media_upload_handler();
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+    return wp_media_upload_handler();
 }
 
 /**
@@ -894,8 +894,8 @@ 
  * @return null|string
  */
 function media_upload_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
-	return wp_media_upload_handler();
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+    return wp_media_upload_handler();
 }
 
 /**
@@ -907,8 +907,8 @@ 
  * @return null|string
  */
 function media_upload_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
-	return wp_media_upload_handler();
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+    return wp_media_upload_handler();
 }
 
 /**
@@ -920,8 +920,8 @@ 
  * @return null|string
  */
 function media_upload_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
-	return wp_media_upload_handler();
+    _deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+    return wp_media_upload_handler();
 }
 
 /**
@@ -933,8 +933,8 @@ 
  * @return string
  */
 function type_url_form_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')" );
-	return wp_media_insert_url_form( 'image' );
+    _deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')" );
+    return wp_media_insert_url_form( 'image' );
 }
 
 /**
@@ -946,8 +946,8 @@ 
  * @return string
  */
 function type_url_form_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')" );
-	return wp_media_insert_url_form( 'audio' );
+    _deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')" );
+    return wp_media_insert_url_form( 'audio' );
 }
 
 /**
@@ -959,8 +959,8 @@ 
  * @return string
  */
 function type_url_form_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')" );
-	return wp_media_insert_url_form( 'video' );
+    _deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')" );
+    return wp_media_insert_url_form( 'video' );
 }
 
 /**
@@ -972,8 +972,8 @@ 
  * @return string
  */
 function type_url_form_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')" );
-	return wp_media_insert_url_form( 'file' );
+    _deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')" );
+    return wp_media_insert_url_form( 'file' );
 }
 
 /**
@@ -990,12 +990,12 @@ 
  * @param string    $help   The content of an 'Overview' help tab.
  */
 function add_contextual_help( $screen, $help ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
+    _deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+    if ( is_string( $screen ) )
+        $screen = convert_to_screen( $screen );
 
-	WP_Screen::add_old_compat_help( $screen, $help );
+    WP_Screen::add_old_compat_help( $screen, $help );
 }
 
 /**
@@ -1008,16 +1008,16 @@ 
  * @return WP_Theme[] Array of WP_Theme objects keyed by their name.
  */
 function get_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )" );
+    _deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )" );
 
-	$themes = wp_get_themes( array( 'allowed' => true ) );
+    $themes = wp_get_themes( array( 'allowed' => true ) );
 
-	$wp_themes = array();
-	foreach ( $themes as $theme ) {
-		$wp_themes[ $theme->get('Name') ] = $theme;
-	}
+    $wp_themes = array();
+    foreach ( $themes as $theme ) {
+        $wp_themes[ $theme->get('Name') ] = $theme;
+    }
 
-	return $wp_themes;
+    return $wp_themes;
 }
 
 /**
@@ -1030,19 +1030,19 @@ 
  * @return array
  */
 function get_broken_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )" );
+    _deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )" );
 
-	$themes = wp_get_themes( array( 'errors' => true ) );
-	$broken = array();
-	foreach ( $themes as $theme ) {
-		$name = $theme->get('Name');
-		$broken[ $name ] = array(
-			'Name' => $name,
-			'Title' => $name,
-			'Description' => $theme->errors()->get_error_message(),
-		);
-	}
-	return $broken;
+    $themes = wp_get_themes( array( 'errors' => true ) );
+    $broken = array();
+    foreach ( $themes as $theme ) {
+        $name = $theme->get('Name');
+        $broken[ $name ] = array(
+            'Name' => $name,
+            'Title' => $name,
+            'Description' => $theme->errors()->get_error_message(),
+        );
+    }
+    return $broken;
 }
 
 /**
@@ -1055,9 +1055,9 @@ 
  * @return WP_Theme
  */
 function current_theme_info() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+    _deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
 
-	return wp_get_theme();
+    return wp_get_theme();
 }
 
 /**
@@ -1068,7 +1068,7 @@ 
  * @deprecated 3.5.0
  */
 function _insert_into_post_button( $type ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+    _deprecated_function( __FUNCTION__, '3.5.0' );
 }
 
 /**
@@ -1079,7 +1079,7 @@ 
  * @deprecated 3.5.0
  */
 function _media_button($title, $icon, $type, $id) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+    _deprecated_function( __FUNCTION__, '3.5.0' );
 }
 
 /**
@@ -1093,9 +1093,9 @@ 
  * @return WP_Post
  */
 function get_post_to_edit( $id ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
+    _deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
 
-	return get_post( $id, OBJECT, 'edit' );
+    return get_post( $id, OBJECT, 'edit' );
 }
 
 /**
@@ -1108,11 +1108,11 @@ 
  * @return WP_Post Post object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
-	_deprecated_function( __FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )" );
+    _deprecated_function( __FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )" );
 
-	$page = get_default_post_to_edit();
-	$page->post_type = 'page';
-	return $page;
+    $page = get_default_post_to_edit();
+    $page->post_type = 'page';
+    return $page;
 }
 
 /**
@@ -1128,8 +1128,8 @@ 
  * @return string Thumbnail path on success, Error string on failure.
  */
 function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'image_resize()' );
-	return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
+    _deprecated_function( __FUNCTION__, '3.5.0', 'image_resize()' );
+    return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
 }
 
 /**
@@ -1141,7 +1141,7 @@ 
  * @deprecated 3.6.0
  */
 function wp_nav_menu_locations_meta_box() {
-	_deprecated_function( __FUNCTION__, '3.6.0' );
+    _deprecated_function( __FUNCTION__, '3.6.0' );
 }
 
 /**
@@ -1155,14 +1155,14 @@ 
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
+    _deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
 
-	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$upgrader = new Core_Upgrader();
-	return $upgrader->upgrade($current);
+    require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Core_Upgrader();
+    return $upgrader->upgrade($current);
 
 }
 
@@ -1178,14 +1178,14 @@ 
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
+    _deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
 
-	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$upgrader = new Plugin_Upgrader();
-	return $upgrader->upgrade($plugin);
+    require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Plugin_Upgrader();
+    return $upgrader->upgrade($plugin);
 }
 
 /**
@@ -1200,14 +1200,14 @@ 
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
+    _deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
 
-	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$upgrader = new Theme_Upgrader();
-	return $upgrader->upgrade($theme);
+    require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Theme_Upgrader();
+    return $upgrader->upgrade($theme);
 }
 
 /**
@@ -1219,7 +1219,7 @@ 
  * @param int|bool $id
  */
 function the_attachment_links( $id = false ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
+    _deprecated_function( __FUNCTION__, '3.7.0' );
 }
 
 /**
@@ -1229,8 +1229,8 @@ 
  * @deprecated 3.8.0
  */
 function screen_icon() {
-	_deprecated_function( __FUNCTION__, '3.8.0' );
-	echo get_screen_icon();
+    _deprecated_function( __FUNCTION__, '3.8.0' );
+    echo get_screen_icon();
 }
 
 /**
@@ -1242,8 +1242,8 @@ 
  * @return string An HTML comment explaining that icons are no longer used.
  */
 function get_screen_icon() {
-	_deprecated_function( __FUNCTION__, '3.8.0' );
-	return '<!-- Screen icons are no longer used as of WordPress 3.8. -->';
+    _deprecated_function( __FUNCTION__, '3.8.0' );
+    return '<!-- Screen icons are no longer used as of WordPress 3.8. -->';
 }
 
 /**
@@ -1321,76 +1321,76 @@ 
  * @param array  $args Array of arguments for this RSS feed.
  */
 function wp_dashboard_plugins_output( $rss, $args = array() ) {
-	_deprecated_function( __FUNCTION__, '4.8.0' );
+    _deprecated_function( __FUNCTION__, '4.8.0' );
 
-	// Plugin feeds plus link to install them.
-	$popular = fetch_feed( $args['url']['popular'] );
+    // Plugin feeds plus link to install them.
+    $popular = fetch_feed( $args['url']['popular'] );
 
-	if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
-		$plugin_slugs = array_keys( get_plugins() );
-		set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
-	}
+    if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
+        $plugin_slugs = array_keys( get_plugins() );
+        set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
+    }
 
-	echo '<ul>';
+    echo '<ul>';
 
-	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+    foreach ( array( $popular ) as $feed ) {
+        if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
+            continue;
 
-		$items = $feed->get_items(0, 5);
+        $items = $feed->get_items(0, 5);
 
-		// Pick a random, non-installed plugin.
-		while ( true ) {
-			// Abort this foreach loop iteration if there's no plugins left of this type.
-			if ( 0 === count($items) )
-				continue 2;
+        // Pick a random, non-installed plugin.
+        while ( true ) {
+            // Abort this foreach loop iteration if there's no plugins left of this type.
+            if ( 0 === count($items) )
+                continue 2;
 
-			$item_key = array_rand($items);
-			$item = $items[$item_key];
+            $item_key = array_rand($items);
+            $item = $items[$item_key];
 
-			list($link, $frag) = explode( '#', $item->get_link() );
+            list($link, $frag) = explode( '#', $item->get_link() );
 
-			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
-				unset( $items[$item_key] );
-				continue;
-			}
+            $link = esc_url($link);
+            if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+                $slug = $matches[1];
+            else {
+                unset( $items[$item_key] );
+                continue;
+            }
 
-			// Is this random plugin's slug already installed? If so, try again.
-			reset( $plugin_slugs );
-			foreach ( $plugin_slugs as $plugin_slug ) {
-				if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
-					unset( $items[$item_key] );
-					continue 2;
-				}
-			}
+            // Is this random plugin's slug already installed? If so, try again.
+            reset( $plugin_slugs );
+            foreach ( $plugin_slugs as $plugin_slug ) {
+                if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
+                    unset( $items[$item_key] );
+                    continue 2;
+                }
+            }
 
-			// If we get to this point, then the random plugin isn't installed and we can stop the while().
-			break;
-		}
+            // If we get to this point, then the random plugin isn't installed and we can stop the while().
+            break;
+        }
 
-		// Eliminate some common badly formed plugin descriptions.
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+        // Eliminate some common badly formed plugin descriptions.
+        while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+            unset($items[$item_key]);
 
-		if ( !isset($items[$item_key]) )
-			continue;
+        if ( !isset($items[$item_key]) )
+            continue;
 
-		$raw_title = $item->get_title();
+        $raw_title = $item->get_title();
 
-		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
-		echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
-			'&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
-			/* translators: %s: Plugin name. */
-			esc_attr( sprintf( _x( 'Install %s', 'plugin' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
+        $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
+        echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
+            '&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
+            /* translators: %s: Plugin name. */
+            esc_attr( sprintf( _x( 'Install %s', 'plugin' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
 
-		$feed->__destruct();
-		unset( $feed );
-	}
+        $feed->__destruct();
+        unset( $feed );
+    }
 
-	echo '</ul>';
+    echo '</ul>';
 }
 
 /**
@@ -1404,7 +1404,7 @@ 
  * @param int $new_ID
  */
 function _relocate_children( $old_ID, $new_ID ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+    _deprecated_function( __FUNCTION__, '3.9.0' );
 }
 
 /**
@@ -1431,13 +1431,13 @@ 
  * @return string The resulting page's hook_suffix.
  */
 function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+    _deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
 
-	global $_wp_last_object_menu;
+    global $_wp_last_object_menu;
 
-	$_wp_last_object_menu++;
+    $_wp_last_object_menu++;
 
-	return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $callback, $icon_url, $_wp_last_object_menu);
+    return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $callback, $icon_url, $_wp_last_object_menu);
 }
 
 /**
@@ -1464,13 +1464,13 @@ 
  * @return string The resulting page's hook_suffix.
  */
 function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+    _deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
 
-	global $_wp_last_utility_menu;
+    global $_wp_last_utility_menu;
 
-	$_wp_last_utility_menu++;
+    $_wp_last_utility_menu++;
 
-	return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $callback, $icon_url, $_wp_last_utility_menu);
+    return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $callback, $icon_url, $_wp_last_utility_menu);
 }
 
 /**
@@ -1489,13 +1489,13 @@ 
  * @global bool $is_chrome
  */
 function post_form_autocomplete_off() {
-	global $is_safari, $is_chrome;
+    global $is_safari, $is_chrome;
 
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+    _deprecated_function( __FUNCTION__, '4.6.0' );
 
-	if ( $is_safari || $is_chrome ) {
-		echo ' autocomplete="off"';
-	}
+    if ( $is_safari || $is_chrome ) {
+        echo ' autocomplete="off"';
+    }
 }
 
 /**
@@ -1505,7 +1505,7 @@ 
  * @deprecated 4.9.0
  */
 function options_permalink_add_js() {
-	?>
+    ?>
 	<script type="text/javascript">
 		jQuery( function() {
 			jQuery('.permalink-structure input:radio').change(function() {
@@ -1528,15 +1528,15 @@ 
  * @deprecated 5.3.0
  */
 class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Data_Export_Requests_List_Table {
-	function __construct( $args ) {
-		_deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Export_Requests_List_Table' );
+    function __construct( $args ) {
+        _deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Export_Requests_List_Table' );
 
-		if ( ! isset( $args['screen'] ) || $args['screen'] === 'export_personal_data' ) {
-			$args['screen'] = 'export-personal-data';
-		}
+        if ( ! isset( $args['screen'] ) || $args['screen'] === 'export_personal_data' ) {
+            $args['screen'] = 'export-personal-data';
+        }
 
-		parent::__construct( $args );
-	}
+        parent::__construct( $args );
+    }
 }
 
 /**
@@ -1546,15 +1546,15 @@ 
  * @deprecated 5.3.0
  */
 class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Data_Removal_Requests_List_Table {
-	function __construct( $args ) {
-		_deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Removal_Requests_List_Table' );
+    function __construct( $args ) {
+        _deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Removal_Requests_List_Table' );
 
-		if ( ! isset( $args['screen'] ) || $args['screen'] === 'remove_personal_data' ) {
-			$args['screen'] = 'erase-personal-data';
-		}
+        if ( ! isset( $args['screen'] ) || $args['screen'] === 'remove_personal_data' ) {
+            $args['screen'] = 'erase-personal-data';
+        }
 
-		parent::__construct( $args );
-	}
+        parent::__construct( $args );
+    }
 }
 
 /**
@@ -1565,7 +1565,7 @@ 
  * @deprecated 5.3.0
  */
 function _wp_privacy_requests_screen_options() {
-	_deprecated_function( __FUNCTION__, '5.3.0' );
+    _deprecated_function( __FUNCTION__, '5.3.0' );
 }
 
 /**
@@ -1580,7 +1580,7 @@ 
  * @return array Attachment post object converted to an array.
  */
 function image_attachment_fields_to_save( $post, $attachment ) {
-	_deprecated_function( __FUNCTION__, '6.0.0' );
+    _deprecated_function( __FUNCTION__, '6.0.0' );
 
-	return $post;
+    return $post;
 }

Spacing +195 added lines, -195 removed lines

@@ -18,7 +18,7 @@ 
  * @see wp_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_editor()');
 
 	wp_tiny_mce();
 }
@@ -31,7 +31,7 @@ 
  *
  */
 function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 }
 
 /**
@@ -47,9 +47,9 @@ 
  * @param int $hmax Maximum wanted height
  * @return array Shrunk dimensions (width, height).
  */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, $wmax, $hmax);
 }
 
 /**
@@ -63,9 +63,9 @@ 
  * @param int $height Current height of the image
  * @return array Shrunk dimensions (width, height).
  */
-function get_udims( $width, $height ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, 128, 96 );
+function get_udims($width, $height) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, 128, 96);
 }
 
 /**
@@ -81,10 +81,10 @@ 
  * @param int   $category_parent  Unused.
  * @param array $popular_ids      Unused.
  */
-function dropdown_categories( $default_category = 0, $category_parent = 0, $popular_ids = array() ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' );
+function dropdown_categories($default_category = 0, $category_parent = 0, $popular_ids = array()) {
+	_deprecated_function(__FUNCTION__, '2.6.0', 'wp_category_checklist()');
 	global $post_ID;
-	wp_category_checklist( $post_ID );
+	wp_category_checklist($post_ID);
 }
 
 /**
@@ -98,10 +98,10 @@ 
  *
  * @param int $default_link_category Unused.
  */
-function dropdown_link_categories( $default_link_category = 0 ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_link_category_checklist()' );
+function dropdown_link_categories($default_link_category = 0) {
+	_deprecated_function(__FUNCTION__, '2.6.0', 'wp_link_category_checklist()');
 	global $link_id;
-	wp_link_category_checklist( $link_id );
+	wp_link_category_checklist($link_id);
 }
 
 /**
@@ -114,8 +114,8 @@ 
  * @param string $file Filesystem path relative to the wp-content directory.
  * @return string Full filesystem path to edit.
  */
-function get_real_file_to_edit( $file ) {
-	_deprecated_function( __FUNCTION__, '2.9.0' );
+function get_real_file_to_edit($file) {
+	_deprecated_function(__FUNCTION__, '2.9.0');
 
 	return WP_CONTENT_DIR . $file;
 }
@@ -134,21 +134,21 @@ 
  * @param array $categories    Optional. Categories to include in the control. Default 0.
  * @return void|false Void on success, false if no categories were found.
  */
-function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+function wp_dropdown_cats($current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_dropdown_categories()');
+	if (!$categories)
+		$categories = get_categories(array('hide_empty' => 0));
 
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $current_cat != $category->term_id && $category_parent == $category->parent) {
-				$pad = str_repeat( '– ', $level );
-				$category->name = esc_html( $category->name );
+	if ($categories) {
+		foreach ($categories as $category) {
+			if ($current_cat != $category->term_id && $category_parent == $category->parent) {
+				$pad = str_repeat('– ', $level);
+				$category->name = esc_html($category->name);
 				echo "\n\t<option value='$category->term_id'";
-				if ( $current_parent == $category->term_id )
+				if ($current_parent == $category->term_id)
 					echo " selected='selected'";
 				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $current_cat, $current_parent, $category->term_id, $level +1, $categories );
+				wp_dropdown_cats($current_cat, $current_parent, $category->term_id, $level + 1, $categories);
 			}
 		}
 	} else {
@@ -169,9 +169,9 @@ 
  * @param string   $option_name       The name of an option to sanitize and save.
  * @param callable $sanitize_callback Optional. A callback function that sanitizes the option's value.
  */
-function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'register_setting()' );
-	register_setting( $option_group, $option_name, $sanitize_callback );
+function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'register_setting()');
+	register_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -185,9 +185,9 @@ 
  * @param string   $option_name       The name of the option to unregister.
  * @param callable $sanitize_callback Optional. Deprecated.
  */
-function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'unregister_setting()' );
-	unregister_setting( $option_group, $option_name, $sanitize_callback );
+function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'unregister_setting()');
+	unregister_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -198,8 +198,8 @@ 
  *
  * @param string $filename
 **/
-function codepress_get_lang( $filename ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+function codepress_get_lang($filename) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -209,7 +209,7 @@ 
  * @deprecated 3.0.0
 **/
 function codepress_footer_js() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -219,7 +219,7 @@ 
  * @deprecated 3.0.0
 **/
 function use_codepress() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -232,15 +232,15 @@ 
  * @return array List of user IDs.
  */
 function get_author_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
-	if ( !is_multisite() )
+	if (!is_multisite())
 		$level_key = $wpdb->get_blog_prefix() . 'user_level';
 	else
 		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key));
 }
 
 /**
@@ -253,18 +253,18 @@ 
  * @param int $user_id User ID.
  * @return array|false List of editable authors. False if no editable users.
  */
-function get_editable_authors( $user_id ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_editable_authors($user_id) {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( !$editable ) {
+	if (!$editable) {
 		return false;
 	} else {
 		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+		$authors = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name");
 	}
 
 	return apply_filters('get_editable_authors', $authors);
@@ -281,32 +281,32 @@ 
  * @param bool $exclude_zeros Optional. Whether to exclude zeroes. Default true.
  * @return array Array of editable user IDs, empty array otherwise.
  */
-function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_editable_user_ids($user_id, $exclude_zeros = true, $post_type = 'post') {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
+	if (!$user = get_userdata($user_id))
 		return array();
 	$post_type_obj = get_post_type_object($post_type);
 
-	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
+	if (!$user->has_cap($post_type_obj->cap->edit_others_posts)) {
+		if ($user->has_cap($post_type_obj->cap->edit_posts) || !$exclude_zeros)
 			return array($user->ID);
 		else
 			return array();
 	}
 
-	if ( !is_multisite() )
+	if (!is_multisite())
 		$level_key = $wpdb->get_blog_prefix() . 'user_level';
 	else
 		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
+	if ($exclude_zeros)
 		$query .= " AND meta_value != '0'";
 
-	return $wpdb->get_col( $query );
+	return $wpdb->get_col($query);
 }
 
 /**
@@ -317,19 +317,19 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  */
 function get_nonauthor_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	if ( !is_multisite() )
+	if (!is_multisite())
 		$level_key = $wpdb->get_blog_prefix() . 'user_level';
 	else
 		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key));
 }
 
-if ( ! class_exists( 'WP_User_Search', false ) ) :
+if (!class_exists('WP_User_Search', false)) :
 /**
  * WordPress User Search class.
  *
@@ -492,12 +492,12 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1.0', 'WP_User_Query' );
+	function __construct($search_term = '', $page = '', $role = '') {
+		_deprecated_function(__FUNCTION__, '3.1.0', 'WP_User_Query');
 
-		$this->search_term = wp_unslash( $search_term );
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = ( '' == $page ) ? 1 : (int) $page;
+		$this->search_term = wp_unslash($search_term);
+		$this->raw_page = ('' == $page) ? false : (int) $page;
+		$this->page = ('' == $page) ? 1 : (int) $page;
 		$this->role = $role;
 
 		$this->prepare_query();
@@ -515,8 +515,8 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
-		self::__construct( $search_term, $page, $role );
+	public function WP_User_Search($search_term = '', $page = '', $role = '') {
+		self::__construct($search_term, $page, $role);
 	}
 
 	/**
@@ -533,11 +533,11 @@ 
 		$this->query_orderby = ' ORDER BY user_login';
 
 		$search_sql = '';
-		if ( $this->search_term ) {
+		if ($this->search_term) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach (array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col)
+				$searches[] = $wpdb->prepare($col . ' LIKE %s', '%' . like_escape($this->search_term) . '%');
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -545,16 +545,16 @@ 
 		$this->query_from = " FROM $wpdb->users";
 		$this->query_where = " WHERE 1=1 $search_sql";
 
-		if ( $this->role ) {
+		if ($this->role) {
 			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
 			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
+		} elseif (is_multisite()) {
 			$level_key = $wpdb->prefix . 'capabilities'; // WPMU site admins don't have user_levels.
 			$this->query_from .= ", $wpdb->usermeta";
 			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
 		}
 
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
+		do_action_ref_array('pre_user_search', array(&$this));
 	}
 
 	/**
@@ -568,7 +568,7 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
+		if ($this->results)
 			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // No limit.
 		else
 			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
@@ -589,27 +589,27 @@ 
 	 * @access public
 	 */
 	public function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results.
+		if ($this->total_users_for_query > $this->users_per_page) { // Have to page the results.
 			$args = array();
-			if ( ! empty($this->search_term) )
+			if (!empty($this->search_term))
 				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
+			if (!empty($this->role))
 				$args['role'] = urlencode($this->role);
 
-			$this->paging_text = paginate_links( array(
+			$this->paging_text = paginate_links(array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
 				'current' => $this->page,
 				'base' => 'users.php?%_%',
 				'format' => 'userspage=%#%',
 				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
+			));
+			if ($this->paging_text) {
 				$this->paging_text = sprintf(
 					/* translators: 1: Starting number of users on the current page, 2: Ending number of users, 3: Total number of users. */
-					'<span class="displaying-num">' . __( 'Displaying %1$s&#8211;%2$s of %3$s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
+					'<span class="displaying-num">' . __('Displaying %1$s&#8211;%2$s of %3$s') . '</span>%s',
+					number_format_i18n(($this->page - 1) * $this->users_per_page + 1),
+					number_format_i18n(min($this->page * $this->users_per_page, $this->total_users_for_query)),
+					number_format_i18n($this->total_users_for_query),
 					$this->paging_text
 				);
 			}
@@ -651,7 +651,7 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
+		if ($this->paging_text)
 			return true;
 		return false;
 	}
@@ -665,7 +665,7 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
+		if ($this->search_term)
 			return true;
 		return false;
 	}
@@ -686,25 +686,25 @@ 
  *                        Default 'any'.
  * @return array List of posts from others.
  */
-function get_others_unpublished_posts( $user_id, $type = 'any' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+function get_others_unpublished_posts($user_id, $type = 'any') {
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( in_array($type, array('draft', 'pending')) )
+	if (in_array($type, array('draft', 'pending')))
 		$type_sql = " post_status = '$type' ";
 	else
 		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
 
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
+	$dir = ('pending' == $type) ? 'ASC' : 'DESC';
 
-	if ( !$editable ) {
+	if (!$editable) {
 		$other_unpubs = '';
 	} else {
 		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
+		$other_unpubs = $wpdb->get_results($wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id));
 	}
 
 	return apply_filters('get_others_drafts', $other_unpubs);
@@ -720,7 +720,7 @@ 
  * @return array List of drafts from other users.
  */
 function get_others_drafts($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return get_others_unpublished_posts($user_id, 'draft');
 }
@@ -735,7 +735,7 @@ 
  * @return array List of posts with pending review post type from other users.
  */
 function get_others_pending($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return get_others_unpublished_posts($user_id, 'pending');
 }
@@ -748,7 +748,7 @@ 
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()' );
+	_deprecated_function(__FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()');
 	wp_dashboard_quick_press();
 }
 
@@ -759,12 +759,12 @@ 
  * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  */
-function wp_tiny_mce( $teeny = false, $settings = false ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+function wp_tiny_mce($teeny = false, $settings = false) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
+	if (!class_exists('_WP_Editors', false))
 		require_once ABSPATH . WPINC . '/class-wp-editor.php';
 
 	$editor_id = 'content' . $num++;
@@ -786,7 +786,7 @@ 
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -796,7 +796,7 @@ 
  * @see wp_editor()
  */
 function wp_print_editor_js() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -806,7 +806,7 @@ 
  * @see wp_editor()
  */
 function wp_quicktags() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -816,12 +816,12 @@ 
  * @deprecated 3.3.0 WP_Screen::render_screen_layout()
  * @see WP_Screen::render_screen_layout()
  */
-function screen_layout( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()' );
+function screen_layout($screen) {
+	_deprecated_function(__FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if (!$current_screen)
 		return '';
 
 	ob_start();
@@ -836,12 +836,12 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_per_page_options()
  * @see WP_Screen::render_per_page_options()
  */
-function screen_options( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()' );
+function screen_options($screen) {
+	_deprecated_function(__FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if (!$current_screen)
 		return '';
 
 	ob_start();
@@ -856,7 +856,7 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_screen_meta()
  * @see WP_Screen::render_screen_meta()
  */
-function screen_meta( $screen ) {
+function screen_meta($screen) {
 	$current_screen = get_current_screen();
 	$current_screen->render_screen_meta();
 }
@@ -869,7 +869,7 @@ 
  * @see WP_Admin_Bar
  */
 function favorite_actions() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'WP_Admin_Bar' );
+	_deprecated_function(__FUNCTION__, '3.2.0', 'WP_Admin_Bar');
 }
 
 /**
@@ -881,7 +881,7 @@ 
  * @return null|string
  */
 function media_upload_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -894,7 +894,7 @@ 
  * @return null|string
  */
 function media_upload_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -907,7 +907,7 @@ 
  * @return null|string
  */
 function media_upload_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -920,7 +920,7 @@ 
  * @return null|string
  */
 function media_upload_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -933,8 +933,8 @@ 
  * @return string
  */
 function type_url_form_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')" );
-	return wp_media_insert_url_form( 'image' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')");
+	return wp_media_insert_url_form('image');
 }
 
 /**
@@ -946,8 +946,8 @@ 
  * @return string
  */
 function type_url_form_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')" );
-	return wp_media_insert_url_form( 'audio' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')");
+	return wp_media_insert_url_form('audio');
 }
 
 /**
@@ -959,8 +959,8 @@ 
  * @return string
  */
 function type_url_form_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')" );
-	return wp_media_insert_url_form( 'video' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')");
+	return wp_media_insert_url_form('video');
 }
 
 /**
@@ -972,8 +972,8 @@ 
  * @return string
  */
 function type_url_form_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')" );
-	return wp_media_insert_url_form( 'file' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')");
+	return wp_media_insert_url_form('file');
 }
 
 /**
@@ -989,13 +989,13 @@ 
  *                          the hook name returned by the `add_*_page()` functions.
  * @param string    $help   The content of an 'Overview' help tab.
  */
-function add_contextual_help( $screen, $help ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
+function add_contextual_help($screen, $help) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()');
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	WP_Screen::add_old_compat_help( $screen, $help );
+	WP_Screen::add_old_compat_help($screen, $help);
 }
 
 /**
@@ -1008,13 +1008,13 @@ 
  * @return WP_Theme[] Array of WP_Theme objects keyed by their name.
  */
 function get_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )" );
+	_deprecated_function(__FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )");
 
-	$themes = wp_get_themes( array( 'allowed' => true ) );
+	$themes = wp_get_themes(array('allowed' => true));
 
 	$wp_themes = array();
-	foreach ( $themes as $theme ) {
-		$wp_themes[ $theme->get('Name') ] = $theme;
+	foreach ($themes as $theme) {
+		$wp_themes[$theme->get('Name')] = $theme;
 	}
 
 	return $wp_themes;
@@ -1030,13 +1030,13 @@ 
  * @return array
  */
 function get_broken_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )" );
+	_deprecated_function(__FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )");
 
-	$themes = wp_get_themes( array( 'errors' => true ) );
+	$themes = wp_get_themes(array('errors' => true));
 	$broken = array();
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		$broken[ $name ] = array(
+		$broken[$name] = array(
 			'Name' => $name,
 			'Title' => $name,
 			'Description' => $theme->errors()->get_error_message(),
@@ -1055,7 +1055,7 @@ 
  * @return WP_Theme
  */
 function current_theme_info() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
 
 	return wp_get_theme();
 }
@@ -1067,8 +1067,8 @@ 
  *
  * @deprecated 3.5.0
  */
-function _insert_into_post_button( $type ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+function _insert_into_post_button($type) {
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -1079,7 +1079,7 @@ 
  * @deprecated 3.5.0
  */
 function _media_button($title, $icon, $type, $id) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -1092,10 +1092,10 @@ 
  * @param int $id
  * @return WP_Post
  */
-function get_post_to_edit( $id ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
+function get_post_to_edit($id) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'get_post()');
 
-	return get_post( $id, OBJECT, 'edit' );
+	return get_post($id, OBJECT, 'edit');
 }
 
 /**
@@ -1108,7 +1108,7 @@ 
  * @return WP_Post Post object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
-	_deprecated_function( __FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )" );
+	_deprecated_function(__FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )");
 
 	$page = get_default_post_to_edit();
 	$page->post_type = 'page';
@@ -1127,9 +1127,9 @@ 
  * @param mixed $deprecated Never used.
  * @return string Thumbnail path on success, Error string on failure.
  */
-function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'image_resize()' );
-	return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
+function wp_create_thumbnail($file, $max_side, $deprecated = '') {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'image_resize()');
+	return apply_filters('wp_create_thumbnail', image_resize($file, $max_side, $max_side));
 }
 
 /**
@@ -1141,7 +1141,7 @@ 
  * @deprecated 3.6.0
  */
 function wp_nav_menu_locations_meta_box() {
-	_deprecated_function( __FUNCTION__, '3.6.0' );
+	_deprecated_function(__FUNCTION__, '3.6.0');
 }
 
 /**
@@ -1155,9 +1155,9 @@ 
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Core_Upgrader();');
 
-	if ( !empty($feedback) )
+	if (!empty($feedback))
 		add_filter('update_feedback', $feedback);
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
@@ -1178,9 +1178,9 @@ 
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Plugin_Upgrader();');
 
-	if ( !empty($feedback) )
+	if (!empty($feedback))
 		add_filter('update_feedback', $feedback);
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
@@ -1200,9 +1200,9 @@ 
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Theme_Upgrader();');
 
-	if ( !empty($feedback) )
+	if (!empty($feedback))
 		add_filter('update_feedback', $feedback);
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
@@ -1218,8 +1218,8 @@ 
  *
  * @param int|bool $id
  */
-function the_attachment_links( $id = false ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
+function the_attachment_links($id = false) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
 }
 
 /**
@@ -1229,7 +1229,7 @@ 
  * @deprecated 3.8.0
  */
 function screen_icon() {
-	_deprecated_function( __FUNCTION__, '3.8.0' );
+	_deprecated_function(__FUNCTION__, '3.8.0');
 	echo get_screen_icon();
 }
 
@@ -1242,7 +1242,7 @@ 
  * @return string An HTML comment explaining that icons are no longer used.
  */
 function get_screen_icon() {
-	_deprecated_function( __FUNCTION__, '3.8.0' );
+	_deprecated_function(__FUNCTION__, '3.8.0');
 	return '<!-- Screen icons are no longer used as of WordPress 3.8. -->';
 }
 
@@ -1320,49 +1320,49 @@ 
  * @param string $rss  The RSS feed URL.
  * @param array  $args Array of arguments for this RSS feed.
  */
-function wp_dashboard_plugins_output( $rss, $args = array() ) {
-	_deprecated_function( __FUNCTION__, '4.8.0' );
+function wp_dashboard_plugins_output($rss, $args = array()) {
+	_deprecated_function(__FUNCTION__, '4.8.0');
 
 	// Plugin feeds plus link to install them.
-	$popular = fetch_feed( $args['url']['popular'] );
+	$popular = fetch_feed($args['url']['popular']);
 
-	if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
-		$plugin_slugs = array_keys( get_plugins() );
-		set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
+	if (false === $plugin_slugs = get_transient('plugin_slugs')) {
+		$plugin_slugs = array_keys(get_plugins());
+		set_transient('plugin_slugs', $plugin_slugs, DAY_IN_SECONDS);
 	}
 
 	echo '<ul>';
 
-	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
+	foreach (array($popular) as $feed) {
+		if (is_wp_error($feed) || !$feed->get_item_quantity())
 			continue;
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin.
-		while ( true ) {
+		while (true) {
 			// Abort this foreach loop iteration if there's no plugins left of this type.
-			if ( 0 === count($items) )
+			if (0 === count($items))
 				continue 2;
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
 
-			list($link, $frag) = explode( '#', $item->get_link() );
+			list($link, $frag) = explode('#', $item->get_link());
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+			if (preg_match('|/([^/]+?)/?$|', $link, $matches))
 				$slug = $matches[1];
 			else {
-				unset( $items[$item_key] );
+				unset($items[$item_key]);
 				continue;
 			}
 
 			// Is this random plugin's slug already installed? If so, try again.
-			reset( $plugin_slugs );
-			foreach ( $plugin_slugs as $plugin_slug ) {
-				if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
-					unset( $items[$item_key] );
+			reset($plugin_slugs);
+			foreach ($plugin_slugs as $plugin_slug) {
+				if ($slug == substr($plugin_slug, 0, strlen($slug))) {
+					unset($items[$item_key]);
 					continue 2;
 				}
 			}
@@ -1372,22 +1372,22 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions.
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+		while ((null !== $item_key = array_rand($items)) && false !== strpos($items[$item_key]->get_description(), 'Plugin Name:'))
 			unset($items[$item_key]);
 
-		if ( !isset($items[$item_key]) )
+		if (!isset($items[$item_key]))
 			continue;
 
 		$raw_title = $item->get_title();
 
 		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
-		echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
+		echo '<li class="dashboard-news-plugin"><span>' . __('Popular Plugin') . ':</span> ' . esc_html($raw_title) .
 			'&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
 			/* translators: %s: Plugin name. */
-			esc_attr( sprintf( _x( 'Install %s', 'plugin' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
+			esc_attr(sprintf(_x('Install %s', 'plugin'), $raw_title)) . '">(' . __('Install') . ')</a></li>';
 
 		$feed->__destruct();
-		unset( $feed );
+		unset($feed);
 	}
 
 	echo '</ul>';
@@ -1403,8 +1403,8 @@ 
  * @param int $old_ID
  * @param int $new_ID
  */
-function _relocate_children( $old_ID, $new_ID ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+function _relocate_children($old_ID, $new_ID) {
+	_deprecated_function(__FUNCTION__, '3.9.0');
 }
 
 /**
@@ -1430,8 +1430,8 @@ 
  * @param string   $icon_url   Optional. The URL to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+function add_object_page($page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5.0', 'add_menu_page()');
 
 	global $_wp_last_object_menu;
 
@@ -1463,8 +1463,8 @@ 
  * @param string   $icon_url   Optional. The URL to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+function add_utility_page($page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5.0', 'add_menu_page()');
 
 	global $_wp_last_utility_menu;
 
@@ -1491,9 +1491,9 @@ 
 function post_form_autocomplete_off() {
 	global $is_safari, $is_chrome;
 
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+	_deprecated_function(__FUNCTION__, '4.6.0');
 
-	if ( $is_safari || $is_chrome ) {
+	if ($is_safari || $is_chrome) {
 		echo ' autocomplete="off"';
 	}
 }
@@ -1528,14 +1528,14 @@ 
  * @deprecated 5.3.0
  */
 class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Data_Export_Requests_List_Table {
-	function __construct( $args ) {
-		_deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Export_Requests_List_Table' );
+	function __construct($args) {
+		_deprecated_function(__CLASS__, '5.3.0', 'WP_Privacy_Data_Export_Requests_List_Table');
 
-		if ( ! isset( $args['screen'] ) || $args['screen'] === 'export_personal_data' ) {
+		if (!isset($args['screen']) || $args['screen'] === 'export_personal_data') {
 			$args['screen'] = 'export-personal-data';
 		}
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 }
 
@@ -1546,14 +1546,14 @@ 
  * @deprecated 5.3.0
  */
 class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Data_Removal_Requests_List_Table {
-	function __construct( $args ) {
-		_deprecated_function( __CLASS__, '5.3.0', 'WP_Privacy_Data_Removal_Requests_List_Table' );
+	function __construct($args) {
+		_deprecated_function(__CLASS__, '5.3.0', 'WP_Privacy_Data_Removal_Requests_List_Table');
 
-		if ( ! isset( $args['screen'] ) || $args['screen'] === 'remove_personal_data' ) {
+		if (!isset($args['screen']) || $args['screen'] === 'remove_personal_data') {
 			$args['screen'] = 'erase-personal-data';
 		}
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 }
 
@@ -1565,7 +1565,7 @@ 
  * @deprecated 5.3.0
  */
 function _wp_privacy_requests_screen_options() {
-	_deprecated_function( __FUNCTION__, '5.3.0' );
+	_deprecated_function(__FUNCTION__, '5.3.0');
 }
 
 /**
@@ -1579,8 +1579,8 @@ 
  * @param array $attachment An array of attachment metadata.
  * @return array Attachment post object converted to an array.
  */
-function image_attachment_fields_to_save( $post, $attachment ) {
-	_deprecated_function( __FUNCTION__, '6.0.0' );
+function image_attachment_fields_to_save($post, $attachment) {
+	_deprecated_function(__FUNCTION__, '6.0.0');
 
 	return $post;
 }

Braces +98 added lines, -67 removed lines

@@ -136,8 +136,9 @@ 
  */
 function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+	if (!$categories ) {
+			$categories = get_categories( array('hide_empty' => 0) );
+	}
 
 	if ( $categories ) {
 		foreach ( $categories as $category ) {
@@ -145,8 +146,9 @@ 
 				$pad = str_repeat( '– ', $level );
 				$category->name = esc_html( $category->name );
 				echo "\n\t<option value='$category->term_id'";
-				if ( $current_parent == $category->term_id )
-					echo " selected='selected'";
+				if ( $current_parent == $category->term_id ) {
+									echo " selected='selected'";
+				}
 				echo ">$pad$category->name</option>";
 				wp_dropdown_cats( $current_cat, $current_parent, $category->term_id, $level +1, $categories );
 			}
@@ -235,10 +237,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -286,25 +290,30 @@ 
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
+	if ( ! $user = get_userdata( $user_id ) ) {
+			return array();
+	}
 	$post_type_obj = get_post_type_object($post_type);
 
 	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
+		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros ) {
+					return array($user->ID);
+		} else {
+					return array();
+		}
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+	if ( $exclude_zeros ) {
+			$query .= " AND meta_value != '0'";
+	}
 
 	return $wpdb->get_col( $query );
 }
@@ -321,10 +330,12 @@ 
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
@@ -536,8 +547,9 @@ 
 		if ( $this->search_term ) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col ) {
+							$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			}
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -568,10 +580,13 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // No limit.
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		if ( $this->results ) {
+					$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+		}
+		// No limit.
+		else {
+					$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		}
 	}
 
 	/**
@@ -591,10 +606,12 @@ 
 	public function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results.
 			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
+			if ( ! empty($this->search_term) ) {
+							$args['usersearch'] = urlencode($this->search_term);
+			}
+			if ( ! empty($this->role) ) {
+							$args['role'] = urlencode($this->role);
+			}
 
 			$this->paging_text = paginate_links( array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -651,8 +668,9 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
+		if ( $this->paging_text ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -665,8 +683,9 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
-			return true;
+		if ( $this->search_term ) {
+					return true;
+		}
 		return false;
 	}
 }
@@ -693,10 +712,11 @@ 
 
 	$editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	if ( in_array($type, array('draft', 'pending')) ) {
+			$type_sql = " post_status = '$type' ";
+	} else {
+			$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	}
 
 	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
@@ -764,8 +784,9 @@ 
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once ABSPATH . WPINC . '/class-wp-editor.php';
+	if ( ! class_exists( '_WP_Editors', false ) ) {
+			require_once ABSPATH . WPINC . '/class-wp-editor.php';
+	}
 
 	$editor_id = 'content' . $num++;
 
@@ -821,8 +842,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_screen_layout();
@@ -841,8 +863,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_per_page_options();
@@ -992,8 +1015,9 @@ 
 function add_contextual_help( $screen, $help ) {
 	_deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	WP_Screen::add_old_compat_help( $screen, $help );
 }
@@ -1157,8 +1181,9 @@ 
 function wp_update_core($current, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Core_Upgrader();
@@ -1180,8 +1205,9 @@ 
 function wp_update_plugin($plugin, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Plugin_Upgrader();
@@ -1202,8 +1228,9 @@ 
 function wp_update_theme($theme, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Theme_Upgrader();
@@ -1334,16 +1361,18 @@ 
 	echo '<ul>';
 
 	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) {
+					continue;
+		}
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin.
 		while ( true ) {
 			// Abort this foreach loop iteration if there's no plugins left of this type.
-			if ( 0 === count($items) )
-				continue 2;
+			if ( 0 === count($items) ) {
+							continue 2;
+			}
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
@@ -1351,9 +1380,9 @@ 
 			list($link, $frag) = explode( '#', $item->get_link() );
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
+			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) {
+							$slug = $matches[1];
+			} else {
 				unset( $items[$item_key] );
 				continue;
 			}
@@ -1372,11 +1401,13 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions.
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) {
+					unset($items[$item_key]);
+		}
 
-		if ( !isset($items[$item_key]) )
-			continue;
+		if ( !isset($items[$item_key]) ) {
+					continue;
+		}
 
 		$raw_title = $item->get_title();
 

brighty/wp-admin/includes/update.php

Indentation +761 added lines, -761 removed lines

@@ -14,14 +14,14 @@ 
  * @return object|array|false The response from the API on success, false on failure.
  */
 function get_preferred_from_update_core() {
-	$updates = get_core_updates();
-	if ( ! is_array( $updates ) ) {
-		return false;
-	}
-	if ( empty( $updates ) ) {
-		return (object) array( 'response' => 'latest' );
-	}
-	return $updates[0];
+    $updates = get_core_updates();
+    if ( ! is_array( $updates ) ) {
+        return false;
+    }
+    if ( empty( $updates ) ) {
+        return (object) array( 'response' => 'latest' );
+    }
+    return $updates[0];
 }
 
 /**
@@ -34,45 +34,45 @@ 
  * @return array|false Array of the update objects on success, false on failure.
  */
 function get_core_updates( $options = array() ) {
-	$options   = array_merge(
-		array(
-			'available' => true,
-			'dismissed' => false,
-		),
-		$options
-	);
-	$dismissed = get_site_option( 'dismissed_update_core' );
-
-	if ( ! is_array( $dismissed ) ) {
-		$dismissed = array();
-	}
-
-	$from_api = get_site_transient( 'update_core' );
-
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
-		return false;
-	}
-
-	$updates = $from_api->updates;
-	$result  = array();
-	foreach ( $updates as $update ) {
-		if ( 'autoupdate' === $update->response ) {
-			continue;
-		}
-
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
-				$update->dismissed = true;
-				$result[]          = $update;
-			}
-		} else {
-			if ( $options['available'] ) {
-				$update->dismissed = false;
-				$result[]          = $update;
-			}
-		}
-	}
-	return $result;
+    $options   = array_merge(
+        array(
+            'available' => true,
+            'dismissed' => false,
+        ),
+        $options
+    );
+    $dismissed = get_site_option( 'dismissed_update_core' );
+
+    if ( ! is_array( $dismissed ) ) {
+        $dismissed = array();
+    }
+
+    $from_api = get_site_transient( 'update_core' );
+
+    if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+        return false;
+    }
+
+    $updates = $from_api->updates;
+    $result  = array();
+    foreach ( $updates as $update ) {
+        if ( 'autoupdate' === $update->response ) {
+            continue;
+        }
+
+        if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
+            if ( $options['dismissed'] ) {
+                $update->dismissed = true;
+                $result[]          = $update;
+            }
+        } else {
+            if ( $options['available'] ) {
+                $update->dismissed = false;
+                $result[]          = $update;
+            }
+        }
+    }
+    return $result;
 }
 
 /**
@@ -85,29 +85,29 @@ 
  * @return object|false The core update offering on success, false on failure.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) ) {
-		return false;
-	}
-
-	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-
-	$auto_update = false;
-	$upgrader    = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' !== $update->response ) {
-			continue;
-		}
-
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
-			continue;
-		}
-
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
-			$auto_update = $update;
-		}
-	}
-	return $auto_update;
+    $updates = get_site_transient( 'update_core' );
+    if ( ! $updates || empty( $updates->updates ) ) {
+        return false;
+    }
+
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+
+    $auto_update = false;
+    $upgrader    = new WP_Automatic_Updater;
+    foreach ( $updates->updates as $update ) {
+        if ( 'autoupdate' !== $update->response ) {
+            continue;
+        }
+
+        if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
+            continue;
+        }
+
+        if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
+            $auto_update = $update;
+        }
+    }
+    return $auto_update;
 }
 
 /**
@@ -120,43 +120,43 @@ 
  * @return array|false An array of checksums on success, false on failure.
  */
 function get_core_checksums( $version, $locale ) {
-	$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
-	$url      = $http_url;
-
-	$ssl = wp_http_supports( array( 'ssl' ) );
-	if ( $ssl ) {
-		$url = set_url_scheme( $url, 'https' );
-	}
-
-	$options = array(
-		'timeout' => wp_doing_cron() ? 30 : 3,
-	);
-
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error(
-			sprintf(
-				/* translators: %s: Support forums URL. */
-				__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-				__( 'https://wordpress.org/support/forums/' )
-			) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
-			headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
-		);
-		$response = wp_remote_get( $http_url, $options );
-	}
-
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
-		return false;
-	}
-
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
-
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
-		return false;
-	}
-
-	return $body['checksums'];
+    $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
+    $url      = $http_url;
+
+    $ssl = wp_http_supports( array( 'ssl' ) );
+    if ( $ssl ) {
+        $url = set_url_scheme( $url, 'https' );
+    }
+
+    $options = array(
+        'timeout' => wp_doing_cron() ? 30 : 3,
+    );
+
+    $response = wp_remote_get( $url, $options );
+    if ( $ssl && is_wp_error( $response ) ) {
+        trigger_error(
+            sprintf(
+                /* translators: %s: Support forums URL. */
+                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                __( 'https://wordpress.org/support/forums/' )
+            ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+            headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+        );
+        $response = wp_remote_get( $http_url, $options );
+    }
+
+    if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+        return false;
+    }
+
+    $body = trim( wp_remote_retrieve_body( $response ) );
+    $body = json_decode( $body, true );
+
+    if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
+        return false;
+    }
+
+    return $body['checksums'];
 }
 
 /**
@@ -168,9 +168,9 @@ 
  * @return bool
  */
 function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+    $dismissed = get_site_option( 'dismissed_update_core' );
+    $dismissed[ $update->current . '|' . $update->locale ] = true;
+    return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
 /**
@@ -183,15 +183,15 @@ 
  * @return bool
  */
 function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key       = $version . '|' . $locale;
+    $dismissed = get_site_option( 'dismissed_update_core' );
+    $key       = $version . '|' . $locale;
 
-	if ( ! isset( $dismissed[ $key ] ) ) {
-		return false;
-	}
+    if ( ! isset( $dismissed[ $key ] ) ) {
+        return false;
+    }
 
-	unset( $dismissed[ $key ] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+    unset( $dismissed[ $key ] );
+    return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
 /**
@@ -204,19 +204,19 @@ 
  * @return object|false The core update offering on success, false on failure.
  */
 function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
-
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
-		return false;
-	}
-
-	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale ) {
-			return $update;
-		}
-	}
-	return false;
+    $from_api = get_site_transient( 'update_core' );
+
+    if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+        return false;
+    }
+
+    $updates = $from_api->updates;
+    foreach ( $updates as $update ) {
+        if ( $update->current == $version && $update->locale == $locale ) {
+            return $update;
+        }
+    }
+    return false;
 }
 
 /**
@@ -226,52 +226,52 @@ 
  * @return string
  */
 function core_update_footer( $msg = '' ) {
-	if ( ! current_user_can( 'update_core' ) ) {
-		/* translators: %s: WordPress version. */
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
-	}
-
-	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) ) {
-		$cur = new stdClass;
-	}
-
-	if ( ! isset( $cur->current ) ) {
-		$cur->current = '';
-	}
-
-	if ( ! isset( $cur->response ) ) {
-		$cur->response = '';
-	}
-
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-
-	$is_development_version = preg_match( '/alpha|beta|RC/', $wp_version );
-
-	if ( $is_development_version ) {
-		return sprintf(
-			/* translators: 1: WordPress version number, 2: URL to WordPress Updates screen. */
-			__( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ),
-			get_bloginfo( 'version', 'display' ),
-			network_admin_url( 'update-core.php' )
-		);
-	}
-
-	switch ( $cur->response ) {
-		case 'upgrade':
-			return sprintf(
-				'<strong><a href="%s">%s</a></strong>',
-				network_admin_url( 'update-core.php' ),
-				/* translators: %s: WordPress version. */
-				sprintf( __( 'Get Version %s' ), $cur->current )
-			);
-
-		case 'latest':
-		default:
-			/* translators: %s: WordPress version. */
-			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
-	}
+    if ( ! current_user_can( 'update_core' ) ) {
+        /* translators: %s: WordPress version. */
+        return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+    }
+
+    $cur = get_preferred_from_update_core();
+    if ( ! is_object( $cur ) ) {
+        $cur = new stdClass;
+    }
+
+    if ( ! isset( $cur->current ) ) {
+        $cur->current = '';
+    }
+
+    if ( ! isset( $cur->response ) ) {
+        $cur->response = '';
+    }
+
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+
+    $is_development_version = preg_match( '/alpha|beta|RC/', $wp_version );
+
+    if ( $is_development_version ) {
+        return sprintf(
+            /* translators: 1: WordPress version number, 2: URL to WordPress Updates screen. */
+            __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ),
+            get_bloginfo( 'version', 'display' ),
+            network_admin_url( 'update-core.php' )
+        );
+    }
+
+    switch ( $cur->response ) {
+        case 'upgrade':
+            return sprintf(
+                '<strong><a href="%s">%s</a></strong>',
+                network_admin_url( 'update-core.php' ),
+                /* translators: %s: WordPress version. */
+                sprintf( __( 'Get Version %s' ), $cur->current )
+            );
+
+        case 'latest':
+        default:
+            /* translators: %s: WordPress version. */
+            return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+    }
 }
 
 /**
@@ -281,47 +281,47 @@ 
  * @return void|false
  */
 function update_nag() {
-	global $pagenow;
-
-	if ( is_multisite() && ! current_user_can( 'update_core' ) ) {
-		return false;
-	}
-
-	if ( 'update-core.php' === $pagenow ) {
-		return;
-	}
-
-	$cur = get_preferred_from_update_core();
-
-	if ( ! isset( $cur->response ) || 'upgrade' !== $cur->response ) {
-		return false;
-	}
-
-	$version_url = sprintf(
-		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-		sanitize_title( $cur->current )
-	);
-
-	if ( current_user_can( 'update_core' ) ) {
-		$msg = sprintf(
-			/* translators: 1: URL to WordPress release notes, 2: New WordPress version, 3: URL to network admin, 4: Accessibility text. */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
-			$version_url,
-			$cur->current,
-			network_admin_url( 'update-core.php' ),
-			esc_attr__( 'Please update WordPress now' )
-		);
-	} else {
-		$msg = sprintf(
-			/* translators: 1: URL to WordPress release notes, 2: New WordPress version. */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
-			$version_url,
-			$cur->current
-		);
-	}
-
-	echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+    global $pagenow;
+
+    if ( is_multisite() && ! current_user_can( 'update_core' ) ) {
+        return false;
+    }
+
+    if ( 'update-core.php' === $pagenow ) {
+        return;
+    }
+
+    $cur = get_preferred_from_update_core();
+
+    if ( ! isset( $cur->response ) || 'upgrade' !== $cur->response ) {
+        return false;
+    }
+
+    $version_url = sprintf(
+        /* translators: %s: WordPress version. */
+        esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+        sanitize_title( $cur->current )
+    );
+
+    if ( current_user_can( 'update_core' ) ) {
+        $msg = sprintf(
+            /* translators: 1: URL to WordPress release notes, 2: New WordPress version, 3: URL to network admin, 4: Accessibility text. */
+            __( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
+            $version_url,
+            $cur->current,
+            network_admin_url( 'update-core.php' ),
+            esc_attr__( 'Please update WordPress now' )
+        );
+    } else {
+        $msg = sprintf(
+            /* translators: 1: URL to WordPress release notes, 2: New WordPress version. */
+            __( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
+            $version_url,
+            $cur->current
+        );
+    }
+
+    echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
 }
 
 /**
@@ -330,43 +330,43 @@ 
  * @since 2.5.0
  */
 function update_right_now_message() {
-	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
-	}
-
-	$msg = '';
-
-	if ( current_user_can( 'update_core' ) ) {
-		$cur = get_preferred_from_update_core();
-
-		if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
-			$msg .= sprintf(
-				'<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
-				network_admin_url( 'update-core.php' ),
-				/* translators: %s: WordPress version number, or 'Latest' string. */
-				sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
-			);
-		}
-	}
-
-	/* translators: 1: Version number, 2: Theme name. */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
-
-	/**
-	 * Filters the text displayed in the 'At a Glance' dashboard widget.
-	 *
-	 * Prior to 3.8.0, the widget was named 'Right Now'.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param string $content Default text.
-	 */
-	$content = apply_filters( 'update_right_now_text', $content );
-
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
-
-	echo "<p id='wp-version-message'>$msg</p>";
+    $theme_name = wp_get_theme();
+    if ( current_user_can( 'switch_themes' ) ) {
+        $theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+    }
+
+    $msg = '';
+
+    if ( current_user_can( 'update_core' ) ) {
+        $cur = get_preferred_from_update_core();
+
+        if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
+            $msg .= sprintf(
+                '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
+                network_admin_url( 'update-core.php' ),
+                /* translators: %s: WordPress version number, or 'Latest' string. */
+                sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
+            );
+        }
+    }
+
+    /* translators: 1: Version number, 2: Theme name. */
+    $content = __( 'WordPress %1$s running %2$s theme.' );
+
+    /**
+     * Filters the text displayed in the 'At a Glance' dashboard widget.
+     *
+     * Prior to 3.8.0, the widget was named 'Right Now'.
+     *
+     * @since 4.4.0
+     *
+     * @param string $content Default text.
+     */
+    $content = apply_filters( 'update_right_now_text', $content );
+
+    $msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+
+    echo "<p id='wp-version-message'>$msg</p>";
 }
 
 /**
@@ -375,34 +375,34 @@ 
  * @return array
  */
 function get_plugin_updates() {
-	$all_plugins     = get_plugins();
-	$upgrade_plugins = array();
-	$current         = get_site_transient( 'update_plugins' );
-	foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
-		}
-	}
-
-	return $upgrade_plugins;
+    $all_plugins     = get_plugins();
+    $upgrade_plugins = array();
+    $current         = get_site_transient( 'update_plugins' );
+    foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
+        if ( isset( $current->response[ $plugin_file ] ) ) {
+            $upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
+            $upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+        }
+    }
+
+    return $upgrade_plugins;
 }
 
 /**
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( ! current_user_can( 'update_plugins' ) ) {
-		return;
-	}
-
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach ( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2 );
-		}
-	}
+    if ( ! current_user_can( 'update_plugins' ) ) {
+        return;
+    }
+
+    $plugins = get_site_transient( 'update_plugins' );
+    if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
+        $plugins = array_keys( $plugins->response );
+        foreach ( $plugins as $plugin_file ) {
+            add_action( "after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2 );
+        }
+    }
 }
 
 /**
@@ -415,173 +415,173 @@ 
  * @return void|false
  */
 function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( ! isset( $current->response[ $file ] ) ) {
-		return false;
-	}
-
-	$response = $current->response[ $file ];
-
-	$plugins_allowedtags = array(
-		'a'       => array(
-			'href'  => array(),
-			'title' => array(),
-		),
-		'abbr'    => array( 'title' => array() ),
-		'acronym' => array( 'title' => array() ),
-		'code'    => array(),
-		'em'      => array(),
-		'strong'  => array(),
-	);
-
-	$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
-	$plugin_slug = isset( $response->slug ) ? $response->slug : $response->id;
-
-	if ( isset( $response->slug ) ) {
-		$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . '&section=changelog' );
-	} elseif ( isset( $response->url ) ) {
-		$details_url = $response->url;
-	} else {
-		$details_url = $plugin_data['PluginURI'];
-	}
-
-	$details_url = add_query_arg(
-		array(
-			'TB_iframe' => 'true',
-			'width'     => 600,
-			'height'    => 800,
-		),
-		$details_url
-	);
-
-	/** @var WP_Plugins_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table(
-		'WP_Plugins_List_Table',
-		array(
-			'screen' => get_current_screen(),
-		)
-	);
-
-	if ( is_network_admin() || ! is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active' : '';
-		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
-		}
-
-		$requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
-		$compatible_php = is_php_version_compatible( $requires_php );
-		$notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
-
-		printf(
-			'<tr class="plugin-update-tr%s" id="%s" data-slug="%s" data-plugin="%s">' .
-			'<td colspan="%s" class="plugin-update colspanchange">' .
-			'<div class="update-message notice inline %s notice-alt"><p>',
-			$active_class,
-			esc_attr( $plugin_slug . '-update' ),
-			esc_attr( $plugin_slug ),
-			esc_attr( $file ),
-			esc_attr( $wp_list_table->get_column_count() ),
-			$notice_type
-		);
-
-		if ( ! current_user_can( 'update_plugins' ) ) {
-			printf(
-				/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
-				$plugin_name,
-				esc_url( $details_url ),
-				sprintf(
-					'class="thickbox open-plugin-details-modal" aria-label="%s"',
-					/* translators: 1: Plugin name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
-				),
-				esc_attr( $response->new_version )
-			);
-		} elseif ( empty( $response->package ) ) {
-			printf(
-				/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
-				$plugin_name,
-				esc_url( $details_url ),
-				sprintf(
-					'class="thickbox open-plugin-details-modal" aria-label="%s"',
-					/* translators: 1: Plugin name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
-				),
-				esc_attr( $response->new_version )
-			);
-		} else {
-			if ( $compatible_php ) {
-				printf(
-					/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-					__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
-					$plugin_name,
-					esc_url( $details_url ),
-					sprintf(
-						'class="thickbox open-plugin-details-modal" aria-label="%s"',
-						/* translators: 1: Plugin name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
-					),
-					esc_attr( $response->new_version ),
-					wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
-					sprintf(
-						'class="update-link" aria-label="%s"',
-						/* translators: %s: Plugin name. */
-						esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $plugin_name ) )
-					)
-				);
-			} else {
-				printf(
-					/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number 5: URL to Update PHP page. */
-					__( 'There is a new version of %1$s available, but it does not work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ),
-					$plugin_name,
-					esc_url( $details_url ),
-					sprintf(
-						'class="thickbox open-plugin-details-modal" aria-label="%s"',
-						/* translators: 1: Plugin name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
-					),
-					esc_attr( $response->new_version ),
-					esc_url( wp_get_update_php_url() )
-				);
-				wp_update_php_annotation( '<br><em>', '</em>' );
-			}
-		}
-
-		/**
-		 * Fires at the end of the update message container in each
-		 * row of the plugins list table.
-		 *
-		 * The dynamic portion of the hook name, `$file`, refers to the path
-		 * of the plugin's primary file relative to the plugins directory.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param array  $plugin_data An array of plugin metadata. See get_plugin_data()
-		 *                            and the {@see 'plugin_row_meta'} filter for the list
-		 *                            of possible values.
-		 * @param object $response {
-		 *     An object of metadata about the available plugin update.
-		 *
-		 *     @type string   $id           Plugin ID, e.g. `w.org/plugins/[plugin-name]`.
-		 *     @type string   $slug         Plugin slug.
-		 *     @type string   $plugin       Plugin basename.
-		 *     @type string   $new_version  New plugin version.
-		 *     @type string   $url          Plugin URL.
-		 *     @type string   $package      Plugin update package URL.
-		 *     @type string[] $icons        An array of plugin icon URLs.
-		 *     @type string[] $banners      An array of plugin banner URLs.
-		 *     @type string[] $banners_rtl  An array of plugin RTL banner URLs.
-		 *     @type string   $requires     The version of WordPress which the plugin requires.
-		 *     @type string   $tested       The version of WordPress the plugin is tested against.
-		 *     @type string   $requires_php The version of PHP which the plugin requires.
-		 * }
-		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
-		echo '</p></div></td></tr>';
-	}
+    $current = get_site_transient( 'update_plugins' );
+    if ( ! isset( $current->response[ $file ] ) ) {
+        return false;
+    }
+
+    $response = $current->response[ $file ];
+
+    $plugins_allowedtags = array(
+        'a'       => array(
+            'href'  => array(),
+            'title' => array(),
+        ),
+        'abbr'    => array( 'title' => array() ),
+        'acronym' => array( 'title' => array() ),
+        'code'    => array(),
+        'em'      => array(),
+        'strong'  => array(),
+    );
+
+    $plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
+    $plugin_slug = isset( $response->slug ) ? $response->slug : $response->id;
+
+    if ( isset( $response->slug ) ) {
+        $details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . '&section=changelog' );
+    } elseif ( isset( $response->url ) ) {
+        $details_url = $response->url;
+    } else {
+        $details_url = $plugin_data['PluginURI'];
+    }
+
+    $details_url = add_query_arg(
+        array(
+            'TB_iframe' => 'true',
+            'width'     => 600,
+            'height'    => 800,
+        ),
+        $details_url
+    );
+
+    /** @var WP_Plugins_List_Table $wp_list_table */
+    $wp_list_table = _get_list_table(
+        'WP_Plugins_List_Table',
+        array(
+            'screen' => get_current_screen(),
+        )
+    );
+
+    if ( is_network_admin() || ! is_multisite() ) {
+        if ( is_network_admin() ) {
+            $active_class = is_plugin_active_for_network( $file ) ? ' active' : '';
+        } else {
+            $active_class = is_plugin_active( $file ) ? ' active' : '';
+        }
+
+        $requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
+        $compatible_php = is_php_version_compatible( $requires_php );
+        $notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
+
+        printf(
+            '<tr class="plugin-update-tr%s" id="%s" data-slug="%s" data-plugin="%s">' .
+            '<td colspan="%s" class="plugin-update colspanchange">' .
+            '<div class="update-message notice inline %s notice-alt"><p>',
+            $active_class,
+            esc_attr( $plugin_slug . '-update' ),
+            esc_attr( $plugin_slug ),
+            esc_attr( $file ),
+            esc_attr( $wp_list_table->get_column_count() ),
+            $notice_type
+        );
+
+        if ( ! current_user_can( 'update_plugins' ) ) {
+            printf(
+                /* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
+                __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+                $plugin_name,
+                esc_url( $details_url ),
+                sprintf(
+                    'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                    /* translators: 1: Plugin name, 2: Version number. */
+                    esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+                ),
+                esc_attr( $response->new_version )
+            );
+        } elseif ( empty( $response->package ) ) {
+            printf(
+                /* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
+                __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+                $plugin_name,
+                esc_url( $details_url ),
+                sprintf(
+                    'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                    /* translators: 1: Plugin name, 2: Version number. */
+                    esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+                ),
+                esc_attr( $response->new_version )
+            );
+        } else {
+            if ( $compatible_php ) {
+                printf(
+                    /* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
+                    __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+                    $plugin_name,
+                    esc_url( $details_url ),
+                    sprintf(
+                        'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                        /* translators: 1: Plugin name, 2: Version number. */
+                        esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+                    ),
+                    esc_attr( $response->new_version ),
+                    wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
+                    sprintf(
+                        'class="update-link" aria-label="%s"',
+                        /* translators: %s: Plugin name. */
+                        esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $plugin_name ) )
+                    )
+                );
+            } else {
+                printf(
+                    /* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number 5: URL to Update PHP page. */
+                    __( 'There is a new version of %1$s available, but it does not work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ),
+                    $plugin_name,
+                    esc_url( $details_url ),
+                    sprintf(
+                        'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                        /* translators: 1: Plugin name, 2: Version number. */
+                        esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+                    ),
+                    esc_attr( $response->new_version ),
+                    esc_url( wp_get_update_php_url() )
+                );
+                wp_update_php_annotation( '<br><em>', '</em>' );
+            }
+        }
+
+        /**
+         * Fires at the end of the update message container in each
+         * row of the plugins list table.
+         *
+         * The dynamic portion of the hook name, `$file`, refers to the path
+         * of the plugin's primary file relative to the plugins directory.
+         *
+         * @since 2.8.0
+         *
+         * @param array  $plugin_data An array of plugin metadata. See get_plugin_data()
+         *                            and the {@see 'plugin_row_meta'} filter for the list
+         *                            of possible values.
+         * @param object $response {
+         *     An object of metadata about the available plugin update.
+         *
+         *     @type string   $id           Plugin ID, e.g. `w.org/plugins/[plugin-name]`.
+         *     @type string   $slug         Plugin slug.
+         *     @type string   $plugin       Plugin basename.
+         *     @type string   $new_version  New plugin version.
+         *     @type string   $url          Plugin URL.
+         *     @type string   $package      Plugin update package URL.
+         *     @type string[] $icons        An array of plugin icon URLs.
+         *     @type string[] $banners      An array of plugin banner URLs.
+         *     @type string[] $banners_rtl  An array of plugin RTL banner URLs.
+         *     @type string   $requires     The version of WordPress which the plugin requires.
+         *     @type string   $tested       The version of WordPress the plugin is tested against.
+         *     @type string   $requires_php The version of PHP which the plugin requires.
+         * }
+         */
+        do_action( "in_plugin_update_message-{$file}", $plugin_data, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
+        echo '</p></div></td></tr>';
+    }
 }
 
 /**
@@ -590,37 +590,37 @@ 
  * @return array
  */
 function get_theme_updates() {
-	$current = get_site_transient( 'update_themes' );
+    $current = get_site_transient( 'update_themes' );
 
-	if ( ! isset( $current->response ) ) {
-		return array();
-	}
+    if ( ! isset( $current->response ) ) {
+        return array();
+    }
 
-	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
-	}
+    $update_themes = array();
+    foreach ( $current->response as $stylesheet => $data ) {
+        $update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
+        $update_themes[ $stylesheet ]->update = $data;
+    }
 
-	return $update_themes;
+    return $update_themes;
 }
 
 /**
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( ! current_user_can( 'update_themes' ) ) {
-		return;
-	}
-
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset( $themes->response ) && is_array( $themes->response ) ) {
-		$themes = array_keys( $themes->response );
-
-		foreach ( $themes as $theme ) {
-			add_action( "after_theme_row_{$theme}", 'wp_theme_update_row', 10, 2 );
-		}
-	}
+    if ( ! current_user_can( 'update_themes' ) ) {
+        return;
+    }
+
+    $themes = get_site_transient( 'update_themes' );
+    if ( isset( $themes->response ) && is_array( $themes->response ) ) {
+        $themes = array_keys( $themes->response );
+
+        foreach ( $themes as $theme ) {
+            add_action( "after_theme_row_{$theme}", 'wp_theme_update_row', 10, 2 );
+        }
+    }
 }
 
 /**
@@ -633,171 +633,171 @@ 
  * @return void|false
  */
 function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
-
-	if ( ! isset( $current->response[ $theme_key ] ) ) {
-		return false;
-	}
-
-	$response = $current->response[ $theme_key ];
-
-	$details_url = add_query_arg(
-		array(
-			'TB_iframe' => 'true',
-			'width'     => 1024,
-			'height'    => 800,
-		),
-		$current->response[ $theme_key ]['url']
-	);
-
-	/** @var WP_MS_Themes_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
-
-	$active = $theme->is_allowed( 'network' ) ? ' active' : '';
-
-	$requires_wp  = isset( $response['requires'] ) ? $response['requires'] : null;
-	$requires_php = isset( $response['requires_php'] ) ? $response['requires_php'] : null;
-
-	$compatible_wp  = is_wp_version_compatible( $requires_wp );
-	$compatible_php = is_php_version_compatible( $requires_php );
-
-	printf(
-		'<tr class="plugin-update-tr%s" id="%s" data-slug="%s">' .
-		'<td colspan="%s" class="plugin-update colspanchange">' .
-		'<div class="update-message notice inline notice-warning notice-alt"><p>',
-		$active,
-		esc_attr( $theme->get_stylesheet() . '-update' ),
-		esc_attr( $theme->get_stylesheet() ),
-		$wp_list_table->get_column_count()
-	);
-
-	if ( $compatible_wp && $compatible_php ) {
-		if ( ! current_user_can( 'update_themes' ) ) {
-			printf(
-				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
-				$theme['Name'],
-				esc_url( $details_url ),
-				sprintf(
-					'class="thickbox open-plugin-details-modal" aria-label="%s"',
-					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
-				),
-				$response['new_version']
-			);
-		} elseif ( empty( $response['package'] ) ) {
-			printf(
-				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
-				$theme['Name'],
-				esc_url( $details_url ),
-				sprintf(
-					'class="thickbox open-plugin-details-modal" aria-label="%s"',
-					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
-				),
-				$response['new_version']
-			);
-		} else {
-			printf(
-				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
-				$theme['Name'],
-				esc_url( $details_url ),
-				sprintf(
-					'class="thickbox open-plugin-details-modal" aria-label="%s"',
-					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
-				),
-				$response['new_version'],
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
-				sprintf(
-					'class="update-link" aria-label="%s"',
-					/* translators: %s: Theme name. */
-					esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme['Name'] ) )
-				)
-			);
-		}
-	} else {
-		if ( ! $compatible_wp && ! $compatible_php ) {
-			printf(
-				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
-				$theme['Name']
-			);
-			if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
-				printf(
-					/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-					' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-					self_admin_url( 'update-core.php' ),
-					esc_url( wp_get_update_php_url() )
-				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
-			} elseif ( current_user_can( 'update_core' ) ) {
-				printf(
-					/* translators: %s: URL to WordPress Updates screen. */
-					' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
-				);
-			} elseif ( current_user_can( 'update_php' ) ) {
-				printf(
-					/* translators: %s: URL to Update PHP page. */
-					' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
-				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
-			}
-		} elseif ( ! $compatible_wp ) {
-			printf(
-				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
-				$theme['Name']
-			);
-			if ( current_user_can( 'update_core' ) ) {
-				printf(
-					/* translators: %s: URL to WordPress Updates screen. */
-					' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
-				);
-			}
-		} elseif ( ! $compatible_php ) {
-			printf(
-				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
-				$theme['Name']
-			);
-			if ( current_user_can( 'update_php' ) ) {
-				printf(
-					/* translators: %s: URL to Update PHP page. */
-					' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
-				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
-			}
-		}
-	}
-
-	/**
-	 * Fires at the end of the update message container in each
-	 * row of the themes list table.
-	 *
-	 * The dynamic portion of the hook name, `$theme_key`, refers to
-	 * the theme slug as found in the WordPress.org themes repository.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Theme $theme    The WP_Theme object.
-	 * @param array    $response {
-	 *     An array of metadata about the available theme update.
-	 *
-	 *     @type string $new_version New theme version.
-	 *     @type string $url         Theme URL.
-	 *     @type string $package     Theme update package URL.
-	 * }
-	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
-	echo '</p></div></td></tr>';
+    $current = get_site_transient( 'update_themes' );
+
+    if ( ! isset( $current->response[ $theme_key ] ) ) {
+        return false;
+    }
+
+    $response = $current->response[ $theme_key ];
+
+    $details_url = add_query_arg(
+        array(
+            'TB_iframe' => 'true',
+            'width'     => 1024,
+            'height'    => 800,
+        ),
+        $current->response[ $theme_key ]['url']
+    );
+
+    /** @var WP_MS_Themes_List_Table $wp_list_table */
+    $wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
+
+    $active = $theme->is_allowed( 'network' ) ? ' active' : '';
+
+    $requires_wp  = isset( $response['requires'] ) ? $response['requires'] : null;
+    $requires_php = isset( $response['requires_php'] ) ? $response['requires_php'] : null;
+
+    $compatible_wp  = is_wp_version_compatible( $requires_wp );
+    $compatible_php = is_php_version_compatible( $requires_php );
+
+    printf(
+        '<tr class="plugin-update-tr%s" id="%s" data-slug="%s">' .
+        '<td colspan="%s" class="plugin-update colspanchange">' .
+        '<div class="update-message notice inline notice-warning notice-alt"><p>',
+        $active,
+        esc_attr( $theme->get_stylesheet() . '-update' ),
+        esc_attr( $theme->get_stylesheet() ),
+        $wp_list_table->get_column_count()
+    );
+
+    if ( $compatible_wp && $compatible_php ) {
+        if ( ! current_user_can( 'update_themes' ) ) {
+            printf(
+                /* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
+                __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+                $theme['Name'],
+                esc_url( $details_url ),
+                sprintf(
+                    'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                    /* translators: 1: Theme name, 2: Version number. */
+                    esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+                ),
+                $response['new_version']
+            );
+        } elseif ( empty( $response['package'] ) ) {
+            printf(
+                /* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
+                __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+                $theme['Name'],
+                esc_url( $details_url ),
+                sprintf(
+                    'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                    /* translators: 1: Theme name, 2: Version number. */
+                    esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+                ),
+                $response['new_version']
+            );
+        } else {
+            printf(
+                /* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
+                __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+                $theme['Name'],
+                esc_url( $details_url ),
+                sprintf(
+                    'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                    /* translators: 1: Theme name, 2: Version number. */
+                    esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+                ),
+                $response['new_version'],
+                wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
+                sprintf(
+                    'class="update-link" aria-label="%s"',
+                    /* translators: %s: Theme name. */
+                    esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme['Name'] ) )
+                )
+            );
+        }
+    } else {
+        if ( ! $compatible_wp && ! $compatible_php ) {
+            printf(
+                /* translators: %s: Theme name. */
+                __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
+                $theme['Name']
+            );
+            if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+                printf(
+                    /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
+                    ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
+                    self_admin_url( 'update-core.php' ),
+                    esc_url( wp_get_update_php_url() )
+                );
+                wp_update_php_annotation( '</p><p><em>', '</em>' );
+            } elseif ( current_user_can( 'update_core' ) ) {
+                printf(
+                    /* translators: %s: URL to WordPress Updates screen. */
+                    ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                    self_admin_url( 'update-core.php' )
+                );
+            } elseif ( current_user_can( 'update_php' ) ) {
+                printf(
+                    /* translators: %s: URL to Update PHP page. */
+                    ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                    esc_url( wp_get_update_php_url() )
+                );
+                wp_update_php_annotation( '</p><p><em>', '</em>' );
+            }
+        } elseif ( ! $compatible_wp ) {
+            printf(
+                /* translators: %s: Theme name. */
+                __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
+                $theme['Name']
+            );
+            if ( current_user_can( 'update_core' ) ) {
+                printf(
+                    /* translators: %s: URL to WordPress Updates screen. */
+                    ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                    self_admin_url( 'update-core.php' )
+                );
+            }
+        } elseif ( ! $compatible_php ) {
+            printf(
+                /* translators: %s: Theme name. */
+                __( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
+                $theme['Name']
+            );
+            if ( current_user_can( 'update_php' ) ) {
+                printf(
+                    /* translators: %s: URL to Update PHP page. */
+                    ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                    esc_url( wp_get_update_php_url() )
+                );
+                wp_update_php_annotation( '</p><p><em>', '</em>' );
+            }
+        }
+    }
+
+    /**
+     * Fires at the end of the update message container in each
+     * row of the themes list table.
+     *
+     * The dynamic portion of the hook name, `$theme_key`, refers to
+     * the theme slug as found in the WordPress.org themes repository.
+     *
+     * @since 3.1.0
+     *
+     * @param WP_Theme $theme    The WP_Theme object.
+     * @param array    $response {
+     *     An array of metadata about the available theme update.
+     *
+     *     @type string $new_version New theme version.
+     *     @type string $url         Theme URL.
+     *     @type string $package     Theme update package URL.
+     * }
+     */
+    do_action( "in_theme_update_message-{$theme_key}", $theme, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
+    echo '</p></div></td></tr>';
 }
 
 /**
@@ -807,13 +807,13 @@ 
  * @return void|false
  */
 function maintenance_nag() {
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
-		/*
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+    global $upgrading;
+    $nag = isset( $upgrading );
+    if ( ! $nag ) {
+        $failed = get_site_option( 'auto_core_update_failed' );
+        /*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the installation claims we're running the version we attempted, nag.
 		 * This is serious enough to err on the side of nagging.
@@ -823,27 +823,27 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( isset( $failed['attempted'] ) && version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
-			$nag = true;
-		}
-	}
-
-	if ( ! $nag ) {
-		return false;
-	}
-
-	if ( current_user_can( 'update_core' ) ) {
-		$msg = sprintf(
-			/* translators: %s: URL to WordPress Updates screen. */
-			__( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ),
-			'update-core.php'
-		);
-	} else {
-		$msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
-	}
-
-	echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+        $comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
+        if ( isset( $failed['attempted'] ) && version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
+            $nag = true;
+        }
+    }
+
+    if ( ! $nag ) {
+        return false;
+    }
+
+    if ( current_user_can( 'update_core' ) ) {
+        $msg = sprintf(
+            /* translators: %s: URL to WordPress Updates screen. */
+            __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ),
+            'update-core.php'
+        );
+    } else {
+        $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
+    }
+
+    echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
 }
 
 /**
@@ -863,7 +863,7 @@ 
  * @since 4.6.0
  */
 function wp_print_admin_notice_templates() {
-	?>
+    ?>
 	<script id="tmpl-wp-updates-admin-notice" type="text/html">
 		<div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{{ data.message }}}</p></div>
 	</script>
@@ -874,26 +874,26 @@ 
 					<# if ( 1 === data.successes ) { #>
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
-							/* translators: %s: Number of plugins. */
-							printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
-							?>
+                            /* translators: %s: Number of plugins. */
+                            printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
+                            ?>
 						<# } else { #>
 							<?php
-							/* translators: %s: Number of themes. */
-							printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
-							?>
+                            /* translators: %s: Number of themes. */
+                            printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
+                            ?>
 						<# } #>
 					<# } else { #>
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
-							/* translators: %s: Number of plugins. */
-							printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
-							?>
+                            /* translators: %s: Number of plugins. */
+                            printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
+                            ?>
 						<# } else { #>
 							<?php
-							/* translators: %s: Number of themes. */
-							printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
-							?>
+                            /* translators: %s: Number of themes. */
+                            printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
+                            ?>
 						<# } #>
 					<# } #>
 				<# } #>
@@ -901,14 +901,14 @@ 
 					<button class="button-link bulk-action-errors-collapsed" aria-expanded="false">
 						<# if ( 1 === data.errors ) { #>
 							<?php
-							/* translators: %s: Number of failed updates. */
-							printf( __( '%s update failed.' ), '{{ data.errors }}' );
-							?>
+                            /* translators: %s: Number of failed updates. */
+                            printf( __( '%s update failed.' ), '{{ data.errors }}' );
+                            ?>
 						<# } else { #>
 							<?php
-							/* translators: %s: Number of failed updates. */
-							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
-							?>
+                            /* translators: %s: Number of failed updates. */
+                            printf( __( '%s updates failed.' ), '{{ data.errors }}' );
+                            ?>
 						<# } #>
 						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
@@ -955,7 +955,7 @@ 
  * @since 4.6.0
  */
 function wp_print_update_row_templates() {
-	?>
+    ?>
 	<script id="tmpl-item-update-row" type="text/template">
 		<tr class="plugin-update-tr update" id="{{ data.slug }}-update" data-slug="{{ data.slug }}" <# if ( data.plugin ) { #>data-plugin="{{ data.plugin }}"<# } #>>
 			<td colspan="{{ data.colspan }}" class="plugin-update colspanchange">
@@ -968,20 +968,20 @@ 
 			<td colspan="{{ data.colspan }}" class="plugin-update colspanchange">
 				<# if ( data.plugin ) { #>
 					<?php
-					printf(
-						/* translators: %s: Plugin name. */
-						_x( '%s was successfully deleted.', 'plugin' ),
-						'<strong>{{{ data.name }}}</strong>'
-					);
-					?>
+                    printf(
+                        /* translators: %s: Plugin name. */
+                        _x( '%s was successfully deleted.', 'plugin' ),
+                        '<strong>{{{ data.name }}}</strong>'
+                    );
+                    ?>
 				<# } else { #>
 					<?php
-					printf(
-						/* translators: %s: Theme name. */
-						_x( '%s was successfully deleted.', 'theme' ),
-						'<strong>{{{ data.name }}}</strong>'
-					);
-					?>
+                    printf(
+                        /* translators: %s: Theme name. */
+                        _x( '%s was successfully deleted.', 'theme' ),
+                        '<strong>{{{ data.name }}}</strong>'
+                    );
+                    ?>
 				<# } #>
 			</td>
 		</tr>
@@ -995,24 +995,24 @@ 
  * @since 5.2.0
  */
 function wp_recovery_mode_nag() {
-	if ( ! wp_is_recovery_mode() ) {
-		return;
-	}
+    if ( ! wp_is_recovery_mode() ) {
+        return;
+    }
 
-	$url = wp_login_url();
-	$url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
-	$url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
+    $url = wp_login_url();
+    $url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
+    $url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
 
-	?>
+    ?>
 	<div class="notice notice-info">
 		<p>
 			<?php
-			printf(
-				/* translators: %s: Recovery Mode exit link. */
-				__( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
-				esc_url( $url )
-			);
-			?>
+            printf(
+                /* translators: %s: Recovery Mode exit link. */
+                __( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
+                esc_url( $url )
+            );
+            ?>
 		</p>
 	</div>
 	<?php
@@ -1027,35 +1027,35 @@ 
  * @return bool True if auto-updates are enabled for `$type`, false otherwise.
  */
 function wp_is_auto_update_enabled_for_type( $type ) {
-	if ( ! class_exists( 'WP_Automatic_Updater' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
-	}
-
-	$updater = new WP_Automatic_Updater();
-	$enabled = ! $updater->is_disabled();
-
-	switch ( $type ) {
-		case 'plugin':
-			/**
-			 * Filters whether plugins auto-update is enabled.
-			 *
-			 * @since 5.5.0
-			 *
-			 * @param bool $enabled True if plugins auto-update is enabled, false otherwise.
-			 */
-			return apply_filters( 'plugins_auto_update_enabled', $enabled );
-		case 'theme':
-			/**
-			 * Filters whether themes auto-update is enabled.
-			 *
-			 * @since 5.5.0
-			 *
-			 * @param bool $enabled True if themes auto-update is enabled, false otherwise.
-			 */
-			return apply_filters( 'themes_auto_update_enabled', $enabled );
-	}
-
-	return false;
+    if ( ! class_exists( 'WP_Automatic_Updater' ) ) {
+        require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
+    }
+
+    $updater = new WP_Automatic_Updater();
+    $enabled = ! $updater->is_disabled();
+
+    switch ( $type ) {
+        case 'plugin':
+            /**
+             * Filters whether plugins auto-update is enabled.
+             *
+             * @since 5.5.0
+             *
+             * @param bool $enabled True if plugins auto-update is enabled, false otherwise.
+             */
+            return apply_filters( 'plugins_auto_update_enabled', $enabled );
+        case 'theme':
+            /**
+             * Filters whether themes auto-update is enabled.
+             *
+             * @since 5.5.0
+             *
+             * @param bool $enabled True if themes auto-update is enabled, false otherwise.
+             */
+            return apply_filters( 'themes_auto_update_enabled', $enabled );
+    }
+
+    return false;
 }
 
 /**
@@ -1070,8 +1070,8 @@ 
  * @return bool True if auto-updates are forced for `$item`, false otherwise.
  */
 function wp_is_auto_update_forced_for_item( $type, $update, $item ) {
-	/** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
-	return apply_filters( "auto_update_{$type}", $update, $item );
+    /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
+    return apply_filters( "auto_update_{$type}", $update, $item );
 }
 
 /**
@@ -1082,31 +1082,31 @@ 
  * @return string The update message to be shown.
  */
 function wp_get_auto_update_message() {
-	$next_update_time = wp_next_scheduled( 'wp_version_check' );
-
-	// Check if the event exists.
-	if ( false === $next_update_time ) {
-		$message = __( 'Automatic update not scheduled. There may be a problem with WP-Cron.' );
-	} else {
-		$time_to_next_update = human_time_diff( (int) $next_update_time );
-
-		// See if cron is overdue.
-		$overdue = ( time() - $next_update_time ) > 0;
-
-		if ( $overdue ) {
-			$message = sprintf(
-				/* translators: %s: Duration that WP-Cron has been overdue. */
-				__( 'Automatic update overdue by %s. There may be a problem with WP-Cron.' ),
-				$time_to_next_update
-			);
-		} else {
-			$message = sprintf(
-				/* translators: %s: Time until the next update. */
-				__( 'Automatic update scheduled in %s.' ),
-				$time_to_next_update
-			);
-		}
-	}
-
-	return $message;
+    $next_update_time = wp_next_scheduled( 'wp_version_check' );
+
+    // Check if the event exists.
+    if ( false === $next_update_time ) {
+        $message = __( 'Automatic update not scheduled. There may be a problem with WP-Cron.' );
+    } else {
+        $time_to_next_update = human_time_diff( (int) $next_update_time );
+
+        // See if cron is overdue.
+        $overdue = ( time() - $next_update_time ) > 0;
+
+        if ( $overdue ) {
+            $message = sprintf(
+                /* translators: %s: Duration that WP-Cron has been overdue. */
+                __( 'Automatic update overdue by %s. There may be a problem with WP-Cron.' ),
+                $time_to_next_update
+            );
+        } else {
+            $message = sprintf(
+                /* translators: %s: Time until the next update. */
+                __( 'Automatic update scheduled in %s.' ),
+                $time_to_next_update
+            );
+        }
+    }
+
+    return $message;
 }

Spacing +242 added lines, -242 removed lines

@@ -15,11 +15,11 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) ) {
+	if (!is_array($updates)) {
 		return false;
 	}
-	if ( empty( $updates ) ) {
-		return (object) array( 'response' => 'latest' );
+	if (empty($updates)) {
+		return (object) array('response' => 'latest');
 	}
 	return $updates[0];
 }
@@ -33,40 +33,40 @@ 
  *                       set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
-function get_core_updates( $options = array() ) {
-	$options   = array_merge(
+function get_core_updates($options = array()) {
+	$options = array_merge(
 		array(
 			'available' => true,
 			'dismissed' => false,
 		),
 		$options
 	);
-	$dismissed = get_site_option( 'dismissed_update_core' );
+	$dismissed = get_site_option('dismissed_update_core');
 
-	if ( ! is_array( $dismissed ) ) {
+	if (!is_array($dismissed)) {
 		$dismissed = array();
 	}
 
-	$from_api = get_site_transient( 'update_core' );
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+	if (!isset($from_api->updates) || !is_array($from_api->updates)) {
 		return false;
 	}
 
 	$updates = $from_api->updates;
 	$result  = array();
-	foreach ( $updates as $update ) {
-		if ( 'autoupdate' === $update->response ) {
+	foreach ($updates as $update) {
+		if ('autoupdate' === $update->response) {
 			continue;
 		}
 
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
+		if (array_key_exists($update->current . '|' . $update->locale, $dismissed)) {
+			if ($options['dismissed']) {
 				$update->dismissed = true;
 				$result[]          = $update;
 			}
 		} else {
-			if ( $options['available'] ) {
+			if ($options['available']) {
 				$update->dismissed = false;
 				$result[]          = $update;
 			}
@@ -85,8 +85,8 @@ 
  * @return object|false The core update offering on success, false on failure.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) ) {
+	$updates = get_site_transient('update_core');
+	if (!$updates || empty($updates->updates)) {
 		return false;
 	}
 
@@ -94,16 +94,16 @@ 
 
 	$auto_update = false;
 	$upgrader    = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' !== $update->response ) {
+	foreach ($updates->updates as $update) {
+		if ('autoupdate' !== $update->response) {
 			continue;
 		}
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
+		if (!$upgrader->should_update('core', $update, ABSPATH)) {
 			continue;
 		}
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
+		if (!$auto_update || version_compare($update->current, $auto_update->current, '>')) {
 			$auto_update = $update;
 		}
 	}
@@ -119,40 +119,40 @@ 
  * @param string $locale  Locale to query.
  * @return array|false An array of checksums on success, false on failure.
  */
-function get_core_checksums( $version, $locale ) {
-	$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
+function get_core_checksums($version, $locale) {
+	$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query(compact('version', 'locale'), '', '&');
 	$url      = $http_url;
 
-	$ssl = wp_http_supports( array( 'ssl' ) );
-	if ( $ssl ) {
-		$url = set_url_scheme( $url, 'https' );
+	$ssl = wp_http_supports(array('ssl'));
+	if ($ssl) {
+		$url = set_url_scheme($url, 'https');
 	}
 
 	$options = array(
 		'timeout' => wp_doing_cron() ? 30 : 3,
 	);
 
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
+	$response = wp_remote_get($url, $options);
+	if ($ssl && is_wp_error($response)) {
 		trigger_error(
 			sprintf(
 				/* translators: %s: Support forums URL. */
-				__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-				__( 'https://wordpress.org/support/forums/' )
-			) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+				__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+				__('https://wordpress.org/support/forums/')
+			) . ' ' . __('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'),
 			headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 		);
-		$response = wp_remote_get( $http_url, $options );
+		$response = wp_remote_get($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 		return false;
 	}
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
+	if (!is_array($body) || !isset($body['checksums']) || !is_array($body['checksums'])) {
 		return false;
 	}
 
@@ -167,10 +167,10 @@ 
  * @param object $update
  * @return bool
  */
-function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+function dismiss_core_update($update) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$dismissed[$update->current . '|' . $update->locale] = true;
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -182,16 +182,16 @@ 
  * @param string $locale
  * @return bool
  */
-function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
+function undismiss_core_update($version, $locale) {
+	$dismissed = get_site_option('dismissed_update_core');
 	$key       = $version . '|' . $locale;
 
-	if ( ! isset( $dismissed[ $key ] ) ) {
+	if (!isset($dismissed[$key])) {
 		return false;
 	}
 
-	unset( $dismissed[ $key ] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+	unset($dismissed[$key]);
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -203,16 +203,16 @@ 
  * @param string $locale  Locale to find the update for.
  * @return object|false The core update offering on success, false on failure.
  */
-function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
+function find_core_update($version, $locale) {
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+	if (!isset($from_api->updates) || !is_array($from_api->updates)) {
 		return false;
 	}
 
 	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale ) {
+	foreach ($updates as $update) {
+		if ($update->current == $version && $update->locale == $locale) {
 			return $update;
 		}
 	}
@@ -225,52 +225,52 @@ 
  * @param string $msg
  * @return string
  */
-function core_update_footer( $msg = '' ) {
-	if ( ! current_user_can( 'update_core' ) ) {
+function core_update_footer($msg = '') {
+	if (!current_user_can('update_core')) {
 		/* translators: %s: WordPress version. */
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) ) {
+	if (!is_object($cur)) {
 		$cur = new stdClass;
 	}
 
-	if ( ! isset( $cur->current ) ) {
+	if (!isset($cur->current)) {
 		$cur->current = '';
 	}
 
-	if ( ! isset( $cur->response ) ) {
+	if (!isset($cur->response)) {
 		$cur->response = '';
 	}
 
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	$is_development_version = preg_match( '/alpha|beta|RC/', $wp_version );
+	$is_development_version = preg_match('/alpha|beta|RC/', $wp_version);
 
-	if ( $is_development_version ) {
+	if ($is_development_version) {
 		return sprintf(
 			/* translators: 1: WordPress version number, 2: URL to WordPress Updates screen. */
-			__( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ),
-			get_bloginfo( 'version', 'display' ),
-			network_admin_url( 'update-core.php' )
+			__('You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.'),
+			get_bloginfo('version', 'display'),
+			network_admin_url('update-core.php')
 		);
 	}
 
-	switch ( $cur->response ) {
+	switch ($cur->response) {
 		case 'upgrade':
 			return sprintf(
 				'<strong><a href="%s">%s</a></strong>',
-				network_admin_url( 'update-core.php' ),
+				network_admin_url('update-core.php'),
 				/* translators: %s: WordPress version. */
-				sprintf( __( 'Get Version %s' ), $cur->current )
+				sprintf(__('Get Version %s'), $cur->current)
 			);
 
 		case 'latest':
 		default:
 			/* translators: %s: WordPress version. */
-			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+			return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 }
 
@@ -283,39 +283,39 @@ 
 function update_nag() {
 	global $pagenow;
 
-	if ( is_multisite() && ! current_user_can( 'update_core' ) ) {
+	if (is_multisite() && !current_user_can('update_core')) {
 		return false;
 	}
 
-	if ( 'update-core.php' === $pagenow ) {
+	if ('update-core.php' === $pagenow) {
 		return;
 	}
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || 'upgrade' !== $cur->response ) {
+	if (!isset($cur->response) || 'upgrade' !== $cur->response) {
 		return false;
 	}
 
 	$version_url = sprintf(
 		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-		sanitize_title( $cur->current )
+		esc_url(__('https://wordpress.org/support/wordpress-version/version-%s/')),
+		sanitize_title($cur->current)
 	);
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		$msg = sprintf(
 			/* translators: 1: URL to WordPress release notes, 2: New WordPress version, 3: URL to network admin, 4: Accessibility text. */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.'),
 			$version_url,
 			$cur->current,
-			network_admin_url( 'update-core.php' ),
-			esc_attr__( 'Please update WordPress now' )
+			network_admin_url('update-core.php'),
+			esc_attr__('Please update WordPress now')
 		);
 	} else {
 		$msg = sprintf(
 			/* translators: 1: URL to WordPress release notes, 2: New WordPress version. */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.'),
 			$version_url,
 			$cur->current
 		);
@@ -331,27 +331,27 @@ 
  */
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+	if (current_user_can('switch_themes')) {
+		$theme_name = sprintf('<a href="themes.php">%1$s</a>', $theme_name);
 	}
 
 	$msg = '';
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
+		if (isset($cur->response) && 'upgrade' === $cur->response) {
 			$msg .= sprintf(
 				'<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
-				network_admin_url( 'update-core.php' ),
+				network_admin_url('update-core.php'),
 				/* translators: %s: WordPress version number, or 'Latest' string. */
-				sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
+				sprintf(__('Update to %s'), $cur->current ? $cur->current : __('Latest'))
 			);
 		}
 	}
 
 	/* translators: 1: Version number, 2: Theme name. */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
+	$content = __('WordPress %1$s running %2$s theme.');
 
 	/**
 	 * Filters the text displayed in the 'At a Glance' dashboard widget.
@@ -362,9 +362,9 @@ 
 	 *
 	 * @param string $content Default text.
 	 */
-	$content = apply_filters( 'update_right_now_text', $content );
+	$content = apply_filters('update_right_now_text', $content);
 
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">' . $content . '</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -377,11 +377,11 @@ 
 function get_plugin_updates() {
 	$all_plugins     = get_plugins();
 	$upgrade_plugins = array();
-	$current         = get_site_transient( 'update_plugins' );
-	foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+	$current         = get_site_transient('update_plugins');
+	foreach ((array) $all_plugins as $plugin_file => $plugin_data) {
+		if (isset($current->response[$plugin_file])) {
+			$upgrade_plugins[$plugin_file]         = (object) $plugin_data;
+			$upgrade_plugins[$plugin_file]->update = $current->response[$plugin_file];
 		}
 	}
 
@@ -392,15 +392,15 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( ! current_user_can( 'update_plugins' ) ) {
+	if (!current_user_can('update_plugins')) {
 		return;
 	}
 
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach ( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2 );
+	$plugins = get_site_transient('update_plugins');
+	if (isset($plugins->response) && is_array($plugins->response)) {
+		$plugins = array_keys($plugins->response);
+		foreach ($plugins as $plugin_file) {
+			add_action("after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2);
 		}
 	}
 }
@@ -414,32 +414,32 @@ 
  * @param array  $plugin_data Plugin information.
  * @return void|false
  */
-function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( ! isset( $current->response[ $file ] ) ) {
+function wp_plugin_update_row($file, $plugin_data) {
+	$current = get_site_transient('update_plugins');
+	if (!isset($current->response[$file])) {
 		return false;
 	}
 
-	$response = $current->response[ $file ];
+	$response = $current->response[$file];
 
 	$plugins_allowedtags = array(
 		'a'       => array(
 			'href'  => array(),
 			'title' => array(),
 		),
-		'abbr'    => array( 'title' => array() ),
-		'acronym' => array( 'title' => array() ),
+		'abbr'    => array('title' => array()),
+		'acronym' => array('title' => array()),
 		'code'    => array(),
 		'em'      => array(),
 		'strong'  => array(),
 	);
 
-	$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
-	$plugin_slug = isset( $response->slug ) ? $response->slug : $response->id;
+	$plugin_name = wp_kses($plugin_data['Name'], $plugins_allowedtags);
+	$plugin_slug = isset($response->slug) ? $response->slug : $response->id;
 
-	if ( isset( $response->slug ) ) {
-		$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . '&section=changelog' );
-	} elseif ( isset( $response->url ) ) {
+	if (isset($response->slug)) {
+		$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . '&section=changelog');
+	} elseif (isset($response->url)) {
 		$details_url = $response->url;
 	} else {
 		$details_url = $plugin_data['PluginURI'];
@@ -462,15 +462,15 @@ 
 		)
 	);
 
-	if ( is_network_admin() || ! is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active' : '';
+	if (is_network_admin() || !is_multisite()) {
+		if (is_network_admin()) {
+			$active_class = is_plugin_active_for_network($file) ? ' active' : '';
 		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
+			$active_class = is_plugin_active($file) ? ' active' : '';
 		}
 
-		$requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
-		$compatible_php = is_php_version_compatible( $requires_php );
+		$requires_php   = isset($response->requires_php) ? $response->requires_php : null;
+		$compatible_php = is_php_version_compatible($requires_php);
 		$notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
 
 		printf(
@@ -478,74 +478,74 @@ 
 			'<td colspan="%s" class="plugin-update colspanchange">' .
 			'<div class="update-message notice inline %s notice-alt"><p>',
 			$active_class,
-			esc_attr( $plugin_slug . '-update' ),
-			esc_attr( $plugin_slug ),
-			esc_attr( $file ),
-			esc_attr( $wp_list_table->get_column_count() ),
+			esc_attr($plugin_slug . '-update'),
+			esc_attr($plugin_slug),
+			esc_attr($file),
+			esc_attr($wp_list_table->get_column_count()),
 			$notice_type
 		);
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if (!current_user_can('update_plugins')) {
 			printf(
 				/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+				__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				sprintf(
 					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: Plugin name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
-				esc_attr( $response->new_version )
+				esc_attr($response->new_version)
 			);
-		} elseif ( empty( $response->package ) ) {
+		} elseif (empty($response->package)) {
 			printf(
 				/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+				__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				sprintf(
 					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: Plugin name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
-				esc_attr( $response->new_version )
+				esc_attr($response->new_version)
 			);
 		} else {
-			if ( $compatible_php ) {
+			if ($compatible_php) {
 				printf(
 					/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-					__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+					__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 					$plugin_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					sprintf(
 						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: Plugin name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 					),
-					esc_attr( $response->new_version ),
-					wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
+					esc_attr($response->new_version),
+					wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file),
 					sprintf(
 						'class="update-link" aria-label="%s"',
 						/* translators: %s: Plugin name. */
-						esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $plugin_name ) )
+						esc_attr(sprintf(_x('Update %s now', 'plugin'), $plugin_name))
 					)
 				);
 			} else {
 				printf(
 					/* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number 5: URL to Update PHP page. */
-					__( 'There is a new version of %1$s available, but it does not work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ),
+					__('There is a new version of %1$s available, but it does not work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.'),
 					$plugin_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					sprintf(
 						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: Plugin name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 					),
-					esc_attr( $response->new_version ),
-					esc_url( wp_get_update_php_url() )
+					esc_attr($response->new_version),
+					esc_url(wp_get_update_php_url())
 				);
-				wp_update_php_annotation( '<br><em>', '</em>' );
+				wp_update_php_annotation('<br><em>', '</em>');
 			}
 		}
 
@@ -578,7 +578,7 @@ 
 		 *     @type string   $requires_php The version of PHP which the plugin requires.
 		 * }
 		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+		do_action("in_plugin_update_message-{$file}", $plugin_data, $response); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 		echo '</p></div></td></tr>';
 	}
@@ -590,16 +590,16 @@ 
  * @return array
  */
 function get_theme_updates() {
-	$current = get_site_transient( 'update_themes' );
+	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) ) {
+	if (!isset($current->response)) {
 		return array();
 	}
 
 	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
+	foreach ($current->response as $stylesheet => $data) {
+		$update_themes[$stylesheet]         = wp_get_theme($stylesheet);
+		$update_themes[$stylesheet]->update = $data;
 	}
 
 	return $update_themes;
@@ -609,16 +609,16 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( ! current_user_can( 'update_themes' ) ) {
+	if (!current_user_can('update_themes')) {
 		return;
 	}
 
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset( $themes->response ) && is_array( $themes->response ) ) {
-		$themes = array_keys( $themes->response );
+	$themes = get_site_transient('update_themes');
+	if (isset($themes->response) && is_array($themes->response)) {
+		$themes = array_keys($themes->response);
 
-		foreach ( $themes as $theme ) {
-			add_action( "after_theme_row_{$theme}", 'wp_theme_update_row', 10, 2 );
+		foreach ($themes as $theme) {
+			add_action("after_theme_row_{$theme}", 'wp_theme_update_row', 10, 2);
 		}
 	}
 }
@@ -632,14 +632,14 @@ 
  * @param WP_Theme $theme     Theme object.
  * @return void|false
  */
-function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
+function wp_theme_update_row($theme_key, $theme) {
+	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response[ $theme_key ] ) ) {
+	if (!isset($current->response[$theme_key])) {
 		return false;
 	}
 
-	$response = $current->response[ $theme_key ];
+	$response = $current->response[$theme_key];
 
 	$details_url = add_query_arg(
 		array(
@@ -647,132 +647,132 @@ 
 			'width'     => 1024,
 			'height'    => 800,
 		),
-		$current->response[ $theme_key ]['url']
+		$current->response[$theme_key]['url']
 	);
 
 	/** @var WP_MS_Themes_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
+	$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-	$active = $theme->is_allowed( 'network' ) ? ' active' : '';
+	$active = $theme->is_allowed('network') ? ' active' : '';
 
-	$requires_wp  = isset( $response['requires'] ) ? $response['requires'] : null;
-	$requires_php = isset( $response['requires_php'] ) ? $response['requires_php'] : null;
+	$requires_wp  = isset($response['requires']) ? $response['requires'] : null;
+	$requires_php = isset($response['requires_php']) ? $response['requires_php'] : null;
 
-	$compatible_wp  = is_wp_version_compatible( $requires_wp );
-	$compatible_php = is_php_version_compatible( $requires_php );
+	$compatible_wp  = is_wp_version_compatible($requires_wp);
+	$compatible_php = is_php_version_compatible($requires_php);
 
 	printf(
 		'<tr class="plugin-update-tr%s" id="%s" data-slug="%s">' .
 		'<td colspan="%s" class="plugin-update colspanchange">' .
 		'<div class="update-message notice inline notice-warning notice-alt"><p>',
 		$active,
-		esc_attr( $theme->get_stylesheet() . '-update' ),
-		esc_attr( $theme->get_stylesheet() ),
+		esc_attr($theme->get_stylesheet() . '-update'),
+		esc_attr($theme->get_stylesheet()),
 		$wp_list_table->get_column_count()
 	);
 
-	if ( $compatible_wp && $compatible_php ) {
-		if ( ! current_user_can( 'update_themes' ) ) {
+	if ($compatible_wp && $compatible_php) {
+		if (!current_user_can('update_themes')) {
 			printf(
 				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+				__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 				$theme['Name'],
-				esc_url( $details_url ),
+				esc_url($details_url),
 				sprintf(
 					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 				),
 				$response['new_version']
 			);
-		} elseif ( empty( $response['package'] ) ) {
+		} elseif (empty($response['package'])) {
 			printf(
 				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+				__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'),
 				$theme['Name'],
-				esc_url( $details_url ),
+				esc_url($details_url),
 				sprintf(
 					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 				),
 				$response['new_version']
 			);
 		} else {
 			printf(
 				/* translators: 1: Theme name, 2: Details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+				__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 				$theme['Name'],
-				esc_url( $details_url ),
+				esc_url($details_url),
 				sprintf(
 					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: Theme name, 2: Version number. */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 				),
 				$response['new_version'],
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
+				wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key),
 				sprintf(
 					'class="update-link" aria-label="%s"',
 					/* translators: %s: Theme name. */
-					esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme['Name'] ) )
+					esc_attr(sprintf(_x('Update %s now', 'theme'), $theme['Name']))
 				)
 			);
 		}
 	} else {
-		if ( ! $compatible_wp && ! $compatible_php ) {
+		if (!$compatible_wp && !$compatible_php) {
 			printf(
 				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
+				__('There is a new version of %s available, but it does not work with your versions of WordPress and PHP.'),
 				$theme['Name']
 			);
-			if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+			if (current_user_can('update_core') && current_user_can('update_php')) {
 				printf(
 					/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-					' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-					self_admin_url( 'update-core.php' ),
-					esc_url( wp_get_update_php_url() )
+					' ' . __('<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.'),
+					self_admin_url('update-core.php'),
+					esc_url(wp_get_update_php_url())
 				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
-			} elseif ( current_user_can( 'update_core' ) ) {
+				wp_update_php_annotation('</p><p><em>', '</em>');
+			} elseif (current_user_can('update_core')) {
 				printf(
 					/* translators: %s: URL to WordPress Updates screen. */
-					' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
+					' ' . __('<a href="%s">Please update WordPress</a>.'),
+					self_admin_url('update-core.php')
 				);
-			} elseif ( current_user_can( 'update_php' ) ) {
+			} elseif (current_user_can('update_php')) {
 				printf(
 					/* translators: %s: URL to Update PHP page. */
-					' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
+					' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+					esc_url(wp_get_update_php_url())
 				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
+				wp_update_php_annotation('</p><p><em>', '</em>');
 			}
-		} elseif ( ! $compatible_wp ) {
+		} elseif (!$compatible_wp) {
 			printf(
 				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
+				__('There is a new version of %s available, but it does not work with your version of WordPress.'),
 				$theme['Name']
 			);
-			if ( current_user_can( 'update_core' ) ) {
+			if (current_user_can('update_core')) {
 				printf(
 					/* translators: %s: URL to WordPress Updates screen. */
-					' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
+					' ' . __('<a href="%s">Please update WordPress</a>.'),
+					self_admin_url('update-core.php')
 				);
 			}
-		} elseif ( ! $compatible_php ) {
+		} elseif (!$compatible_php) {
 			printf(
 				/* translators: %s: Theme name. */
-				__( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
+				__('There is a new version of %s available, but it does not work with your version of PHP.'),
 				$theme['Name']
 			);
-			if ( current_user_can( 'update_php' ) ) {
+			if (current_user_can('update_php')) {
 				printf(
 					/* translators: %s: URL to Update PHP page. */
-					' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
+					' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+					esc_url(wp_get_update_php_url())
 				);
-				wp_update_php_annotation( '</p><p><em>', '</em>' );
+				wp_update_php_annotation('</p><p><em>', '</em>');
 			}
 		}
 	}
@@ -795,7 +795,7 @@ 
 	 *     @type string $package     Theme update package URL.
 	 * }
 	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	do_action("in_theme_update_message-{$theme_key}", $theme, $response); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 	echo '</p></div></td></tr>';
 }
@@ -810,9 +810,9 @@ 
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
+	$nag = isset($upgrading);
+	if (!$nag) {
+		$failed = get_site_option('auto_core_update_failed');
 		/*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the installation claims we're running the version we attempted, nag.
@@ -823,24 +823,24 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( isset( $failed['attempted'] ) && version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
+		$comparison = !empty($failed['critical']) ? '>=' : '>';
+		if (isset($failed['attempted']) && version_compare($failed['attempted'], $wp_version, $comparison)) {
 			$nag = true;
 		}
 	}
 
-	if ( ! $nag ) {
+	if (!$nag) {
 		return false;
 	}
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		$msg = sprintf(
 			/* translators: %s: URL to WordPress Updates screen. */
-			__( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ),
+			__('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'),
 			'update-core.php'
 		);
 	} else {
-		$msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
+		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 	}
 
 	echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
@@ -875,24 +875,24 @@ 
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins. */
-							printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugin successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes. */
-							printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s theme successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } else { #>
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins. */
-							printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugins successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes. */
-							printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s themes successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } #>
@@ -902,15 +902,15 @@ 
 						<# if ( 1 === data.errors ) { #>
 							<?php
 							/* translators: %s: Number of failed updates. */
-							printf( __( '%s update failed.' ), '{{ data.errors }}' );
+							printf(__('%s update failed.'), '{{ data.errors }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of failed updates. */
-							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
+							printf(__('%s updates failed.'), '{{ data.errors }}');
 							?>
 						<# } #>
-						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Show more details'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				<# } #>
@@ -970,7 +970,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Plugin name. */
-						_x( '%s was successfully deleted.', 'plugin' ),
+						_x('%s was successfully deleted.', 'plugin'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>
@@ -978,7 +978,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Theme name. */
-						_x( '%s was successfully deleted.', 'theme' ),
+						_x('%s was successfully deleted.', 'theme'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>
@@ -995,13 +995,13 @@ 
  * @since 5.2.0
  */
 function wp_recovery_mode_nag() {
-	if ( ! wp_is_recovery_mode() ) {
+	if (!wp_is_recovery_mode()) {
 		return;
 	}
 
 	$url = wp_login_url();
-	$url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
-	$url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
+	$url = add_query_arg('action', WP_Recovery_Mode::EXIT_ACTION, $url);
+	$url = wp_nonce_url($url, WP_Recovery_Mode::EXIT_ACTION);
 
 	?>
 	<div class="notice notice-info">
@@ -1009,8 +1009,8 @@ 
 			<?php
 			printf(
 				/* translators: %s: Recovery Mode exit link. */
-				__( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
-				esc_url( $url )
+				__('You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>'),
+				esc_url($url)
 			);
 			?>
 		</p>
@@ -1026,15 +1026,15 @@ 
  * @param string $type The type of update being checked: 'theme' or 'plugin'.
  * @return bool True if auto-updates are enabled for `$type`, false otherwise.
  */
-function wp_is_auto_update_enabled_for_type( $type ) {
-	if ( ! class_exists( 'WP_Automatic_Updater' ) ) {
+function wp_is_auto_update_enabled_for_type($type) {
+	if (!class_exists('WP_Automatic_Updater')) {
 		require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
 	}
 
 	$updater = new WP_Automatic_Updater();
-	$enabled = ! $updater->is_disabled();
+	$enabled = !$updater->is_disabled();
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'plugin':
 			/**
 			 * Filters whether plugins auto-update is enabled.
@@ -1043,7 +1043,7 @@ 
 			 *
 			 * @param bool $enabled True if plugins auto-update is enabled, false otherwise.
 			 */
-			return apply_filters( 'plugins_auto_update_enabled', $enabled );
+			return apply_filters('plugins_auto_update_enabled', $enabled);
 		case 'theme':
 			/**
 			 * Filters whether themes auto-update is enabled.
@@ -1052,7 +1052,7 @@ 
 			 *
 			 * @param bool $enabled True if themes auto-update is enabled, false otherwise.
 			 */
-			return apply_filters( 'themes_auto_update_enabled', $enabled );
+			return apply_filters('themes_auto_update_enabled', $enabled);
 	}
 
 	return false;
@@ -1069,9 +1069,9 @@ 
  * @param object    $item   The update offer.
  * @return bool True if auto-updates are forced for `$item`, false otherwise.
  */
-function wp_is_auto_update_forced_for_item( $type, $update, $item ) {
+function wp_is_auto_update_forced_for_item($type, $update, $item) {
 	/** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
-	return apply_filters( "auto_update_{$type}", $update, $item );
+	return apply_filters("auto_update_{$type}", $update, $item);
 }
 
 /**
@@ -1082,27 +1082,27 @@ 
  * @return string The update message to be shown.
  */
 function wp_get_auto_update_message() {
-	$next_update_time = wp_next_scheduled( 'wp_version_check' );
+	$next_update_time = wp_next_scheduled('wp_version_check');
 
 	// Check if the event exists.
-	if ( false === $next_update_time ) {
-		$message = __( 'Automatic update not scheduled. There may be a problem with WP-Cron.' );
+	if (false === $next_update_time) {
+		$message = __('Automatic update not scheduled. There may be a problem with WP-Cron.');
 	} else {
-		$time_to_next_update = human_time_diff( (int) $next_update_time );
+		$time_to_next_update = human_time_diff((int) $next_update_time);
 
 		// See if cron is overdue.
-		$overdue = ( time() - $next_update_time ) > 0;
+		$overdue = (time() - $next_update_time) > 0;
 
-		if ( $overdue ) {
+		if ($overdue) {
 			$message = sprintf(
 				/* translators: %s: Duration that WP-Cron has been overdue. */
-				__( 'Automatic update overdue by %s. There may be a problem with WP-Cron.' ),
+				__('Automatic update overdue by %s. There may be a problem with WP-Cron.'),
 				$time_to_next_update
 			);
 		} else {
 			$message = sprintf(
 				/* translators: %s: Time until the next update. */
-				__( 'Automatic update scheduled in %s.' ),
+				__('Automatic update scheduled in %s.'),
 				$time_to_next_update
 			);
 		}

brighty/wp-admin/includes/network.php

Indentation +392 added lines, -392 removed lines

@@ -17,13 +17,13 @@ 
  * @return string|false Base domain if network exists, otherwise false.
  */
 function network_domain_check() {
-	global $wpdb;
+    global $wpdb;
 
-	$sql = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
-	if ( $wpdb->get_var( $sql ) ) {
-		return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
-	}
-	return false;
+    $sql = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
+    if ( $wpdb->get_var( $sql ) ) {
+        return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
+    }
+    return false;
 }
 
 /**
@@ -33,12 +33,12 @@ 
  * @return bool Whether subdomain installation is allowed
  */
 function allow_subdomain_install() {
-	$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
-	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' === $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) {
-		return false;
-	}
+    $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
+    if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' === $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 /**
@@ -51,30 +51,30 @@ 
  * @return bool Whether subdirectory installation is allowed
  */
 function allow_subdirectory_install() {
-	global $wpdb;
-
-	/**
-	 * Filters whether to enable the subdirectory installation feature in Multisite.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param bool $allow Whether to enable the subdirectory installation feature in Multisite.
-	 *                    Default false.
-	 */
-	if ( apply_filters( 'allow_subdirectory_install', false ) ) {
-		return true;
-	}
-
-	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL ) {
-		return true;
-	}
-
-	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
-	if ( empty( $post ) ) {
-		return true;
-	}
-
-	return false;
+    global $wpdb;
+
+    /**
+     * Filters whether to enable the subdirectory installation feature in Multisite.
+     *
+     * @since 3.0.0
+     *
+     * @param bool $allow Whether to enable the subdirectory installation feature in Multisite.
+     *                    Default false.
+     */
+    if ( apply_filters( 'allow_subdirectory_install', false ) ) {
+        return true;
+    }
+
+    if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL ) {
+        return true;
+    }
+
+    $post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
+    if ( empty( $post ) ) {
+        return true;
+    }
+
+    return false;
 }
 
 /**
@@ -84,16 +84,16 @@ 
  * @return string Base domain.
  */
 function get_clean_basedomain() {
-	$existing_domain = network_domain_check();
-	if ( $existing_domain ) {
-		return $existing_domain;
-	}
-	$domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
-	$slash  = strpos( $domain, '/' );
-	if ( $slash ) {
-		$domain = substr( $domain, 0, $slash );
-	}
-	return $domain;
+    $existing_domain = network_domain_check();
+    if ( $existing_domain ) {
+        return $existing_domain;
+    }
+    $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
+    $slash  = strpos( $domain, '/' );
+    if ( $slash ) {
+        $domain = substr( $domain, 0, $slash );
+    }
+    return $domain;
 }
 
 /**
@@ -110,120 +110,120 @@ 
  * @param false|WP_Error $errors Optional. Error object. Default false.
  */
 function network_step1( $errors = false ) {
-	global $is_apache;
-
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
-			/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
-			__( 'The constant %s cannot be defined when creating a network.' ),
-			'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
-		) . '</p></div>';
-		echo '</div>';
-		require_once ABSPATH . 'wp-admin/admin-footer.php';
-		die();
-	}
-
-	$active_plugins = get_option( 'active_plugins' );
-	if ( ! empty( $active_plugins ) ) {
-		echo '<div class="notice notice-warning"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
-			/* translators: %s: URL to Plugins screen. */
-			__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
-			admin_url( 'plugins.php?plugin_status=active' )
-		) . '</p></div>';
-		echo '<p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
-		echo '</div>';
-		require_once ABSPATH . 'wp-admin/admin-footer.php';
-		die();
-	}
-
-	$hostname  = get_clean_basedomain();
-	$has_ports = strstr( $hostname, ':' );
-	if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
-		echo '<p>' . sprintf(
-			/* translators: %s: Port number. */
-			__( 'You cannot use port numbers such as %s.' ),
-			'<code>' . $has_ports . '</code>'
-		) . '</p>';
-		echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Go to Dashboard' ) . '</a>';
-		echo '</div>';
-		require_once ABSPATH . 'wp-admin/admin-footer.php';
-		die();
-	}
-
-	echo '<form method="post">';
-
-	wp_nonce_field( 'install-network-1' );
-
-	$error_codes = array();
-	if ( is_wp_error( $errors ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
-		foreach ( $errors->get_error_messages() as $error ) {
-			echo "<p>$error</p>";
-		}
-		echo '</div>';
-		$error_codes = $errors->get_error_codes();
-	}
-
-	if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes, true ) ) {
-		$site_name = $_POST['sitename'];
-	} else {
-		/* translators: %s: Default network title. */
-		$site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) );
-	}
-
-	if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes, true ) ) {
-		$admin_email = $_POST['email'];
-	} else {
-		$admin_email = get_option( 'admin_email' );
-	}
-	?>
+    global $is_apache;
+
+    if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+        echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
+            /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
+            __( 'The constant %s cannot be defined when creating a network.' ),
+            '<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
+        ) . '</p></div>';
+        echo '</div>';
+        require_once ABSPATH . 'wp-admin/admin-footer.php';
+        die();
+    }
+
+    $active_plugins = get_option( 'active_plugins' );
+    if ( ! empty( $active_plugins ) ) {
+        echo '<div class="notice notice-warning"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
+            /* translators: %s: URL to Plugins screen. */
+            __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
+            admin_url( 'plugins.php?plugin_status=active' )
+        ) . '</p></div>';
+        echo '<p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
+        echo '</div>';
+        require_once ABSPATH . 'wp-admin/admin-footer.php';
+        die();
+    }
+
+    $hostname  = get_clean_basedomain();
+    $has_ports = strstr( $hostname, ':' );
+    if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
+        echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
+        echo '<p>' . sprintf(
+            /* translators: %s: Port number. */
+            __( 'You cannot use port numbers such as %s.' ),
+            '<code>' . $has_ports . '</code>'
+        ) . '</p>';
+        echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Go to Dashboard' ) . '</a>';
+        echo '</div>';
+        require_once ABSPATH . 'wp-admin/admin-footer.php';
+        die();
+    }
+
+    echo '<form method="post">';
+
+    wp_nonce_field( 'install-network-1' );
+
+    $error_codes = array();
+    if ( is_wp_error( $errors ) ) {
+        echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
+        foreach ( $errors->get_error_messages() as $error ) {
+            echo "<p>$error</p>";
+        }
+        echo '</div>';
+        $error_codes = $errors->get_error_codes();
+    }
+
+    if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes, true ) ) {
+        $site_name = $_POST['sitename'];
+    } else {
+        /* translators: %s: Default network title. */
+        $site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) );
+    }
+
+    if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes, true ) ) {
+        $admin_email = $_POST['email'];
+    } else {
+        $admin_email = get_option( 'admin_email' );
+    }
+    ?>
 	<p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
 	<p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. Configuration files will be created in the next step.' ); ?></p>
 	<?php
 
-	if ( isset( $_POST['subdomain_install'] ) ) {
-		$subdomain_install = (bool) $_POST['subdomain_install'];
-	} elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // Assume nothing.
-		$subdomain_install = true;
-	} elseif ( ! allow_subdirectory_install() ) {
-		$subdomain_install = true;
-	} else {
-		$subdomain_install = false;
-		$got_mod_rewrite   = got_mod_rewrite();
-		if ( $got_mod_rewrite ) { // Dangerous assumptions.
-			echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
-			printf(
-				/* translators: %s: mod_rewrite */
-				__( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
-				'<code>mod_rewrite</code>'
-			);
-			echo '</p>';
-		} elseif ( $is_apache ) {
-			echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
-			printf(
-				/* translators: %s: mod_rewrite */
-				__( 'It looks like the Apache %s module is not installed.' ),
-				'<code>mod_rewrite</code>'
-			);
-			echo '</p>';
-		}
-
-		if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
-			echo '<p>';
-			printf(
-				/* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
-				__( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
-				'<code>mod_rewrite</code>',
-				'https://httpd.apache.org/docs/mod/mod_rewrite.html',
-				'https://www.google.com/search?q=apache+mod_rewrite'
-			);
-			echo '</p></div>';
-		}
-	}
-
-	if ( allow_subdomain_install() && allow_subdirectory_install() ) :
-		?>
+    if ( isset( $_POST['subdomain_install'] ) ) {
+        $subdomain_install = (bool) $_POST['subdomain_install'];
+    } elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // Assume nothing.
+        $subdomain_install = true;
+    } elseif ( ! allow_subdirectory_install() ) {
+        $subdomain_install = true;
+    } else {
+        $subdomain_install = false;
+        $got_mod_rewrite   = got_mod_rewrite();
+        if ( $got_mod_rewrite ) { // Dangerous assumptions.
+            echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
+            printf(
+                /* translators: %s: mod_rewrite */
+                __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
+                '<code>mod_rewrite</code>'
+            );
+            echo '</p>';
+        } elseif ( $is_apache ) {
+            echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
+            printf(
+                /* translators: %s: mod_rewrite */
+                __( 'It looks like the Apache %s module is not installed.' ),
+                '<code>mod_rewrite</code>'
+            );
+            echo '</p>';
+        }
+
+        if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
+            echo '<p>';
+            printf(
+                /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
+                __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
+                '<code>mod_rewrite</code>',
+                'https://httpd.apache.org/docs/mod/mod_rewrite.html',
+                'https://www.google.com/search?q=apache+mod_rewrite'
+            );
+            echo '</p></div>';
+        }
+    }
+
+    if ( allow_subdomain_install() && allow_subdirectory_install() ) :
+        ?>
 		<h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
 		<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
 			<strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
@@ -234,61 +234,61 @@ 
 				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
 				<td>
 				<?php
-				printf(
-					/* translators: 1: Host name. */
-					_x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
-					$hostname
-				);
-				?>
+                printf(
+                    /* translators: 1: Host name. */
+                    _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
+                    $hostname
+                );
+                ?>
 				</td>
 			</tr>
 			<tr>
 				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
 				<td>
 				<?php
-				printf(
-					/* translators: 1: Host name. */
-					_x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
-					$hostname
-				);
-				?>
+                printf(
+                    /* translators: 1: Host name. */
+                    _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
+                    $hostname
+                );
+                ?>
 				</td>
 			</tr>
 		</table>
 
 		<?php
-	endif;
+    endif;
 
-	if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
-		echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
-	}
+    if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
+        echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+    }
 
-	$is_www = ( 0 === strpos( $hostname, 'www.' ) );
-	if ( $is_www ) :
-		?>
+    $is_www = ( 0 === strpos( $hostname, 'www.' ) );
+    if ( $is_www ) :
+        ?>
 		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
 		<p>
 		<?php
-		printf(
-			/* translators: 1: Site URL, 2: Host name, 3: www. */
-			__( 'You should consider changing your site domain to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
-			'<code>' . substr( $hostname, 4 ) . '</code>',
-			'<code>' . $hostname . '</code>',
-			'<code>www</code>'
-		);
-		?>
+        printf(
+            /* translators: 1: Site URL, 2: Host name, 3: www. */
+            __( 'You should consider changing your site domain to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
+            '<code>' . substr( $hostname, 4 ) . '</code>',
+            '<code>' . $hostname . '</code>',
+            '<code>www</code>'
+        );
+        ?>
 		</p>
 		<table class="form-table" role="presentation">
 			<tr>
 			<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
 			<td>
 				<?php
-					printf(
-						/* translators: %s: Host name. */
-						__( 'The internet address of your network will be %s.' ),
-						'<code>' . $hostname . '</code>'
-					);
-				?>
+                    printf(
+                        /* translators: %s: Host name. */
+                        __( 'The internet address of your network will be %s.' ),
+                        '<code>' . $hostname . '</code>'
+                    );
+                ?>
 				</td>
 			</tr>
 		</table>
@@ -301,17 +301,17 @@ 
 				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
 				<td>
 				<?php
-					printf(
-						/* translators: 1: localhost, 2: localhost.localdomain */
-						__( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
-						'<code>localhost</code>',
-						'<code>localhost.localdomain</code>'
-					);
-					// Uh oh:
-				if ( ! allow_subdirectory_install() ) {
-					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				}
-				?>
+                    printf(
+                        /* translators: 1: localhost, 2: localhost.localdomain */
+                        __( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
+                        '<code>localhost</code>',
+                        '<code>localhost.localdomain</code>'
+                    );
+                    // Uh oh:
+                if ( ! allow_subdirectory_install() ) {
+                    echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                }
+                ?>
 				</td>
 			</tr>
 		<?php elseif ( ! allow_subdomain_install() ) : ?>
@@ -319,12 +319,12 @@ 
 				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
 				<td>
 				<?php
-					_e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
-					// Uh oh:
-				if ( ! allow_subdirectory_install() ) {
-					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				}
-				?>
+                    _e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
+                    // Uh oh:
+                if ( ! allow_subdirectory_install() ) {
+                    echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                }
+                ?>
 				</td>
 			</tr>
 		<?php elseif ( ! allow_subdirectory_install() ) : ?>
@@ -332,9 +332,9 @@ 
 				<th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
 				<td>
 				<?php
-				_e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
-					echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?>
+                _e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
+                    echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                ?>
 				</td>
 			</tr>
 		<?php endif; ?>
@@ -343,12 +343,12 @@ 
 				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
 				<td>
 					<?php
-					printf(
-						/* translators: %s: Host name. */
-						__( 'The internet address of your network will be %s.' ),
-						'<code>' . $hostname . '</code>'
-					);
-					?>
+                    printf(
+                        /* translators: %s: Host name. */
+                        __( 'The internet address of your network will be %s.' ),
+                        '<code>' . $hostname . '</code>'
+                    );
+                    ?>
 				</td>
 			</tr>
 		<?php endif; ?>
@@ -387,104 +387,104 @@ 
  * @param false|WP_Error $errors Optional. Error object. Default false.
  */
 function network_step2( $errors = false ) {
-	global $wpdb, $is_nginx;
-
-	$hostname          = get_clean_basedomain();
-	$slashed_home      = trailingslashit( get_option( 'home' ) );
-	$base              = parse_url( $slashed_home, PHP_URL_PATH );
-	$document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
-	$abspath_fix       = str_replace( '\\', '/', ABSPATH );
-	$home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
-	$wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
-	$rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
-
-	$location_of_wp_config = $abspath_fix;
-	if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) {
-		$location_of_wp_config = dirname( $abspath_fix );
-	}
-	$location_of_wp_config = trailingslashit( $location_of_wp_config );
-
-	// Wildcard DNS message.
-	if ( is_wp_error( $errors ) ) {
-		echo '<div class="error">' . $errors->get_error_message() . '</div>';
-	}
-
-	if ( $_POST ) {
-		if ( allow_subdomain_install() ) {
-			$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
-		} else {
-			$subdomain_install = false;
-		}
-	} else {
-		if ( is_multisite() ) {
-			$subdomain_install = is_subdomain_install();
-			?>
+    global $wpdb, $is_nginx;
+
+    $hostname          = get_clean_basedomain();
+    $slashed_home      = trailingslashit( get_option( 'home' ) );
+    $base              = parse_url( $slashed_home, PHP_URL_PATH );
+    $document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
+    $abspath_fix       = str_replace( '\\', '/', ABSPATH );
+    $home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
+    $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
+    $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
+
+    $location_of_wp_config = $abspath_fix;
+    if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) {
+        $location_of_wp_config = dirname( $abspath_fix );
+    }
+    $location_of_wp_config = trailingslashit( $location_of_wp_config );
+
+    // Wildcard DNS message.
+    if ( is_wp_error( $errors ) ) {
+        echo '<div class="error">' . $errors->get_error_message() . '</div>';
+    }
+
+    if ( $_POST ) {
+        if ( allow_subdomain_install() ) {
+            $subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
+        } else {
+            $subdomain_install = false;
+        }
+    } else {
+        if ( is_multisite() ) {
+            $subdomain_install = is_subdomain_install();
+            ?>
 	<p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
 			<?php
-		} else {
-			$subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
-			?>
+        } else {
+            $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+            ?>
 	<div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
 	<p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
 			<?php
-		}
-	}
+        }
+    }
 
-	$subdir_match          = $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?';
-	$subdir_replacement_01 = $subdomain_install ? '' : '$1';
-	$subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
+    $subdir_match          = $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?';
+    $subdir_replacement_01 = $subdomain_install ? '' : '$1';
+    $subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
 
-	if ( $_POST || ! is_multisite() ) {
-		?>
+    if ( $_POST || ! is_multisite() ) {
+        ?>
 		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
 		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
 		<div class="notice notice-warning inline"><p>
 		<?php
-		if ( file_exists( $home_path . '.htaccess' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
-				/* translators: 1: wp-config.php, 2: .htaccess */
-				__( 'You should back up your existing %1$s and %2$s files.' ),
-				'<code>wp-config.php</code>',
-				'<code>.htaccess</code>'
-			);
-		} elseif ( file_exists( $home_path . 'web.config' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
-				/* translators: 1: wp-config.php, 2: web.config */
-				__( 'You should back up your existing %1$s and %2$s files.' ),
-				'<code>wp-config.php</code>',
-				'<code>web.config</code>'
-			);
-		} else {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
-				/* translators: %s: wp-config.php */
-				__( 'You should back up your existing %s file.' ),
-				'<code>wp-config.php</code>'
-			);
-		}
-		?>
+        if ( file_exists( $home_path . '.htaccess' ) ) {
+            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+            printf(
+                /* translators: 1: wp-config.php, 2: .htaccess */
+                __( 'You should back up your existing %1$s and %2$s files.' ),
+                '<code>wp-config.php</code>',
+                '<code>.htaccess</code>'
+            );
+        } elseif ( file_exists( $home_path . 'web.config' ) ) {
+            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+            printf(
+                /* translators: 1: wp-config.php, 2: web.config */
+                __( 'You should back up your existing %1$s and %2$s files.' ),
+                '<code>wp-config.php</code>',
+                '<code>web.config</code>'
+            );
+        } else {
+            echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+            printf(
+                /* translators: %s: wp-config.php */
+                __( 'You should back up your existing %s file.' ),
+                '<code>wp-config.php</code>'
+            );
+        }
+        ?>
 		</p></div>
 		<?php
-	}
-	?>
+    }
+    ?>
 	<ol>
 		<li><p>
 		<?php
-		printf(
-			/* translators: 1: wp-config.php, 2: Location of wp-config file, 3: Translated version of "That's all, stop editing! Happy publishing." */
-			__( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
-			'<code>wp-config.php</code>',
-			'<code>' . $location_of_wp_config . '</code>',
-			/*
+        printf(
+            /* translators: 1: wp-config.php, 2: Location of wp-config file, 3: Translated version of "That's all, stop editing! Happy publishing." */
+            __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
+            '<code>wp-config.php</code>',
+            '<code>' . $location_of_wp_config . '</code>',
+            /*
 			 * translators: This string should only be translated if wp-config-sample.php is localized.
 			 * You can check the localized release package or
 			 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
 			 */
-			'<code>/* ' . __( 'That&#8217;s all, stop editing! Happy publishing.' ) . ' */</code>'
-		);
-		?>
+            '<code>/* ' . __( 'That&#8217;s all, stop editing! Happy publishing.' ) . ' */</code>'
+        );
+        ?>
 		</p>
 		<textarea class="code" readonly="readonly" cols="100" rows="7">
 define( 'MULTISITE', true );
@@ -495,68 +495,68 @@ 
 define( 'BLOG_ID_CURRENT_SITE', 1 );
 </textarea>
 		<?php
-		$keys_salts = array(
-			'AUTH_KEY'         => '',
-			'SECURE_AUTH_KEY'  => '',
-			'LOGGED_IN_KEY'    => '',
-			'NONCE_KEY'        => '',
-			'AUTH_SALT'        => '',
-			'SECURE_AUTH_SALT' => '',
-			'LOGGED_IN_SALT'   => '',
-			'NONCE_SALT'       => '',
-		);
-		foreach ( $keys_salts as $c => $v ) {
-			if ( defined( $c ) ) {
-				unset( $keys_salts[ $c ] );
-			}
-		}
-
-		if ( ! empty( $keys_salts ) ) {
-			$keys_salts_str = '';
-			$from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-			if ( is_wp_error( $from_api ) ) {
-				foreach ( $keys_salts as $c => $v ) {
-					$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
-				}
-			} else {
-				$from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
-				foreach ( $keys_salts as $c => $v ) {
-					$keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
-				}
-			}
-			$num_keys_salts = count( $keys_salts );
-			?>
+        $keys_salts = array(
+            'AUTH_KEY'         => '',
+            'SECURE_AUTH_KEY'  => '',
+            'LOGGED_IN_KEY'    => '',
+            'NONCE_KEY'        => '',
+            'AUTH_SALT'        => '',
+            'SECURE_AUTH_SALT' => '',
+            'LOGGED_IN_SALT'   => '',
+            'NONCE_SALT'       => '',
+        );
+        foreach ( $keys_salts as $c => $v ) {
+            if ( defined( $c ) ) {
+                unset( $keys_salts[ $c ] );
+            }
+        }
+
+        if ( ! empty( $keys_salts ) ) {
+            $keys_salts_str = '';
+            $from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+            if ( is_wp_error( $from_api ) ) {
+                foreach ( $keys_salts as $c => $v ) {
+                    $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+                }
+            } else {
+                $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+                foreach ( $keys_salts as $c => $v ) {
+                    $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+                }
+            }
+            $num_keys_salts = count( $keys_salts );
+            ?>
 		<p>
 			<?php
-			if ( 1 === $num_keys_salts ) {
-				printf(
-					/* translators: %s: wp-config.php */
-					__( 'This unique authentication key is also missing from your %s file.' ),
-					'<code>wp-config.php</code>'
-				);
-			} else {
-				printf(
-					/* translators: %s: wp-config.php */
-					__( 'These unique authentication keys are also missing from your %s file.' ),
-					'<code>wp-config.php</code>'
-				);
-			}
-			?>
+            if ( 1 === $num_keys_salts ) {
+                printf(
+                    /* translators: %s: wp-config.php */
+                    __( 'This unique authentication key is also missing from your %s file.' ),
+                    '<code>wp-config.php</code>'
+                );
+            } else {
+                printf(
+                    /* translators: %s: wp-config.php */
+                    __( 'These unique authentication keys are also missing from your %s file.' ),
+                    '<code>wp-config.php</code>'
+                );
+            }
+            ?>
 			<?php _e( 'To make your installation more secure, you should also add:' ); ?>
 		</p>
 		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
 			<?php
-		}
-		?>
+        }
+        ?>
 		</li>
 	<?php
-	if ( iis7_supports_permalinks() ) :
-		// IIS doesn't support RewriteBase, all your RewriteBase are belong to us.
-		$iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
-		$iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
-		$iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
+    if ( iis7_supports_permalinks() ) :
+        // IIS doesn't support RewriteBase, all your RewriteBase are belong to us.
+        $iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
+        $iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
+        $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
 
-		$web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
+        $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <system.webServer>
         <rewrite>
@@ -565,14 +565,14 @@ 
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
                 </rule>';
-		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
-			$web_config_file .= '
+        if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+            $web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
                 </rule>';
-		}
-			$web_config_file .= '
+        }
+            $web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
                     <action type="Redirect" url="' . $iis_subdir_replacement . 'wp-admin/" redirectType="Permanent" />
@@ -603,42 +603,42 @@ 
 </configuration>
 ';
 
-			echo '<li><p>';
-			printf(
-				/* translators: 1: File name (.htaccess or web.config), 2: File path. */
-				__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-				'<code>web.config</code>',
-				'<code>' . $home_path . '</code>'
-			);
-		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
-			echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
-		}
-		?>
+            echo '<li><p>';
+            printf(
+                /* translators: 1: File name (.htaccess or web.config), 2: File path. */
+                __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+                '<code>web.config</code>',
+                '<code>' . $home_path . '</code>'
+            );
+        echo '</p>';
+        if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
+            echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+        }
+        ?>
 		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?></textarea>
 		</li>
 	</ol>
 
 		<?php
-	elseif ( $is_nginx ) : // End iis7_supports_permalinks(). Link to Nginx documentation instead:
+    elseif ( $is_nginx ) : // End iis7_supports_permalinks(). Link to Nginx documentation instead:
 
-		echo '<li><p>';
-		printf(
-			/* translators: %s: Documentation URL. */
-			__( 'It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.' ),
-			__( 'https://wordpress.org/support/article/nginx/' )
-		);
-		echo '</p></li>';
+        echo '<li><p>';
+        printf(
+            /* translators: %s: Documentation URL. */
+            __( 'It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.' ),
+            __( 'https://wordpress.org/support/article/nginx/' )
+        );
+        echo '</p></li>';
 
-	else : // End $is_nginx. Construct an .htaccess file instead:
+    else : // End $is_nginx. Construct an .htaccess file instead:
 
-		$ms_files_rewriting = '';
-		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
-			$ms_files_rewriting  = "\n# uploaded files\nRewriteRule ^";
-			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
-		}
+        $ms_files_rewriting = '';
+        if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+            $ms_files_rewriting  = "\n# uploaded files\nRewriteRule ^";
+            $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
+        }
 
-		$htaccess_file = <<<EOF
+        $htaccess_file = <<<EOF
 RewriteEngine On
 RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteBase {$base}
@@ -656,28 +656,28 @@ 
 
 EOF;
 
-		echo '<li><p>';
-		printf(
-			/* translators: 1: File name (.htaccess or web.config), 2: File path. */
-			__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<code>.htaccess</code>',
-			'<code>' . $home_path . '</code>'
-		);
-		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
-			echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
-		}
-		?>
+        echo '<li><p>';
+        printf(
+            /* translators: 1: File name (.htaccess or web.config), 2: File path. */
+            __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+            '<code>.htaccess</code>',
+            '<code>' . $home_path . '</code>'
+        );
+        echo '</p>';
+        if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
+            echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+        }
+        ?>
 		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>"><?php echo esc_textarea( $htaccess_file ); ?></textarea>
 		</li>
 	</ol>
 
 		<?php
-	endif; // End IIS/Nginx/Apache code branches.
+    endif; // End IIS/Nginx/Apache code branches.
 
-	if ( ! is_multisite() ) {
-		?>
+    if ( ! is_multisite() ) {
+        ?>
 		<p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
 		<?php
-	}
+    }
 }

Spacing +161 added lines, -161 removed lines

@@ -19,9 +19,9 @@ 
 function network_domain_check() {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
-	if ( $wpdb->get_var( $sql ) ) {
-		return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
+	$sql = $wpdb->prepare('SHOW TABLES LIKE %s', $wpdb->esc_like($wpdb->site));
+	if ($wpdb->get_var($sql)) {
+		return $wpdb->get_var("SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1");
 	}
 	return false;
 }
@@ -33,8 +33,8 @@ 
  * @return bool Whether subdomain installation is allowed
  */
 function allow_subdomain_install() {
-	$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
-	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' === $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) {
+	$domain = preg_replace('|https?://([^/]+)|', '$1', get_option('home'));
+	if (parse_url(get_option('home'), PHP_URL_PATH) || 'localhost' === $domain || preg_match('|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain)) {
 		return false;
 	}
 
@@ -61,16 +61,16 @@ 
 	 * @param bool $allow Whether to enable the subdirectory installation feature in Multisite.
 	 *                    Default false.
 	 */
-	if ( apply_filters( 'allow_subdirectory_install', false ) ) {
+	if (apply_filters('allow_subdirectory_install', false)) {
 		return true;
 	}
 
-	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL ) {
+	if (defined('ALLOW_SUBDIRECTORY_INSTALL') && ALLOW_SUBDIRECTORY_INSTALL) {
 		return true;
 	}
 
-	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
-	if ( empty( $post ) ) {
+	$post = $wpdb->get_row("SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'");
+	if (empty($post)) {
 		return true;
 	}
 
@@ -85,13 +85,13 @@ 
  */
 function get_clean_basedomain() {
 	$existing_domain = network_domain_check();
-	if ( $existing_domain ) {
+	if ($existing_domain) {
 		return $existing_domain;
 	}
-	$domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
-	$slash  = strpos( $domain, '/' );
-	if ( $slash ) {
-		$domain = substr( $domain, 0, $slash );
+	$domain = preg_replace('|https?://|', '', get_option('siteurl'));
+	$slash  = strpos($domain, '/');
+	if ($slash) {
+		$domain = substr($domain, 0, $slash);
 	}
 	return $domain;
 }
@@ -109,13 +109,13 @@ 
  *
  * @param false|WP_Error $errors Optional. Error object. Default false.
  */
-function network_step1( $errors = false ) {
+function network_step1($errors = false) {
 	global $is_apache;
 
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
+		echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf(
 			/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
-			__( 'The constant %s cannot be defined when creating a network.' ),
+			__('The constant %s cannot be defined when creating a network.'),
 			'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
 		) . '</p></div>';
 		echo '</div>';
@@ -123,29 +123,29 @@ 
 		die();
 	}
 
-	$active_plugins = get_option( 'active_plugins' );
-	if ( ! empty( $active_plugins ) ) {
-		echo '<div class="notice notice-warning"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
+	$active_plugins = get_option('active_plugins');
+	if (!empty($active_plugins)) {
+		echo '<div class="notice notice-warning"><p><strong>' . __('Warning:') . '</strong> ' . sprintf(
 			/* translators: %s: URL to Plugins screen. */
-			__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
-			admin_url( 'plugins.php?plugin_status=active' )
+			__('Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.'),
+			admin_url('plugins.php?plugin_status=active')
 		) . '</p></div>';
-		echo '<p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
+		echo '<p>' . __('Once the network is created, you may reactivate your plugins.') . '</p>';
 		echo '</div>';
 		require_once ABSPATH . 'wp-admin/admin-footer.php';
 		die();
 	}
 
 	$hostname  = get_clean_basedomain();
-	$has_ports = strstr( $hostname, ':' );
-	if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
+	$has_ports = strstr($hostname, ':');
+	if ((false !== $has_ports && !in_array($has_ports, array(':80', ':443'), true))) {
+		echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __('You cannot install a network of sites with your server address.') . '</p></div>';
 		echo '<p>' . sprintf(
 			/* translators: %s: Port number. */
-			__( 'You cannot use port numbers such as %s.' ),
+			__('You cannot use port numbers such as %s.'),
 			'<code>' . $has_ports . '</code>'
 		) . '</p>';
-		echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Go to Dashboard' ) . '</a>';
+		echo '<a href="' . esc_url(admin_url()) . '">' . __('Go to Dashboard') . '</a>';
 		echo '</div>';
 		require_once ABSPATH . 'wp-admin/admin-footer.php';
 		die();
@@ -153,67 +153,67 @@ 
 
 	echo '<form method="post">';
 
-	wp_nonce_field( 'install-network-1' );
+	wp_nonce_field('install-network-1');
 
 	$error_codes = array();
-	if ( is_wp_error( $errors ) ) {
-		echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
-		foreach ( $errors->get_error_messages() as $error ) {
+	if (is_wp_error($errors)) {
+		echo '<div class="error"><p><strong>' . __('Error: The network could not be created.') . '</strong></p>';
+		foreach ($errors->get_error_messages() as $error) {
 			echo "<p>$error</p>";
 		}
 		echo '</div>';
 		$error_codes = $errors->get_error_codes();
 	}
 
-	if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes, true ) ) {
+	if (!empty($_POST['sitename']) && !in_array('empty_sitename', $error_codes, true)) {
 		$site_name = $_POST['sitename'];
 	} else {
 		/* translators: %s: Default network title. */
-		$site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) );
+		$site_name = sprintf(__('%s Sites'), get_option('blogname'));
 	}
 
-	if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes, true ) ) {
+	if (!empty($_POST['email']) && !in_array('invalid_email', $error_codes, true)) {
 		$admin_email = $_POST['email'];
 	} else {
-		$admin_email = get_option( 'admin_email' );
+		$admin_email = get_option('admin_email');
 	}
 	?>
-	<p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
-	<p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. Configuration files will be created in the next step.' ); ?></p>
+	<p><?php _e('Welcome to the Network installation process!'); ?></p>
+	<p><?php _e('Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. Configuration files will be created in the next step.'); ?></p>
 	<?php
 
-	if ( isset( $_POST['subdomain_install'] ) ) {
+	if (isset($_POST['subdomain_install'])) {
 		$subdomain_install = (bool) $_POST['subdomain_install'];
-	} elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // Assume nothing.
+	} elseif (apache_mod_loaded('mod_rewrite')) { // Assume nothing.
 		$subdomain_install = true;
-	} elseif ( ! allow_subdirectory_install() ) {
+	} elseif (!allow_subdirectory_install()) {
 		$subdomain_install = true;
 	} else {
 		$subdomain_install = false;
 		$got_mod_rewrite   = got_mod_rewrite();
-		if ( $got_mod_rewrite ) { // Dangerous assumptions.
-			echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
+		if ($got_mod_rewrite) { // Dangerous assumptions.
+			echo '<div class="updated inline"><p><strong>' . __('Note:') . '</strong> ';
 			printf(
 				/* translators: %s: mod_rewrite */
-				__( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
+				__('Please make sure the Apache %s module is installed as it will be used at the end of this installation.'),
 				'<code>mod_rewrite</code>'
 			);
 			echo '</p>';
-		} elseif ( $is_apache ) {
-			echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
+		} elseif ($is_apache) {
+			echo '<div class="error inline"><p><strong>' . __('Warning:') . '</strong> ';
 			printf(
 				/* translators: %s: mod_rewrite */
-				__( 'It looks like the Apache %s module is not installed.' ),
+				__('It looks like the Apache %s module is not installed.'),
 				'<code>mod_rewrite</code>'
 			);
 			echo '</p>';
 		}
 
-		if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
+		if ($got_mod_rewrite || $is_apache) { // Protect against mod_rewrite mimicry (but ! Apache).
 			echo '<p>';
 			printf(
 				/* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
-				__( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
+				__('If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.'),
 				'<code>mod_rewrite</code>',
 				'https://httpd.apache.org/docs/mod/mod_rewrite.html',
 				'https://www.google.com/search?q=apache+mod_rewrite'
@@ -222,33 +222,33 @@ 
 		}
 	}
 
-	if ( allow_subdomain_install() && allow_subdirectory_install() ) :
+	if (allow_subdomain_install() && allow_subdirectory_install()) :
 		?>
-		<h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
-		<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
-			<strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
-		<p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
+		<h3><?php esc_html_e('Addresses of Sites in your Network'); ?></h3>
+		<p><?php _e('Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.'); ?>
+			<strong><?php _e('You cannot change this later.'); ?></strong></p>
+		<p><?php _e('You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.'); ?></p>
 		<?php // @todo Link to an MS readme? ?>
 		<table class="form-table" role="presentation">
 			<tr>
-				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
+				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked($subdomain_install); ?> /> <?php _e('Sub-domains'); ?></label></th>
 				<td>
 				<?php
 				printf(
 					/* translators: 1: Host name. */
-					_x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
+					_x('like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples'),
 					$hostname
 				);
 				?>
 				</td>
 			</tr>
 			<tr>
-				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
+				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked(!$subdomain_install); ?> /> <?php _e('Sub-directories'); ?></label></th>
 				<td>
 				<?php
 				printf(
 					/* translators: 1: Host name. */
-					_x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
+					_x('like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples'),
 					$hostname
 				);
 				?>
@@ -259,20 +259,20 @@ 
 		<?php
 	endif;
 
-	if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
-		echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+	if (WP_CONTENT_DIR !== ABSPATH . 'wp-content' && (allow_subdirectory_install() || !allow_subdomain_install())) {
+		echo '<div class="error inline"><p><strong>' . __('Warning:') . '</strong> ' . __('Subdirectory networks may not be fully compatible with custom wp-content directories.') . '</p></div>';
 	}
 
-	$is_www = ( 0 === strpos( $hostname, 'www.' ) );
-	if ( $is_www ) :
+	$is_www = (0 === strpos($hostname, 'www.'));
+	if ($is_www) :
 		?>
-		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
+		<h3><?php esc_html_e('Server Address'); ?></h3>
 		<p>
 		<?php
 		printf(
 			/* translators: 1: Site URL, 2: Host name, 3: www. */
-			__( 'You should consider changing your site domain to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
-			'<code>' . substr( $hostname, 4 ) . '</code>',
+			__('You should consider changing your site domain to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.'),
+			'<code>' . substr($hostname, 4) . '</code>',
 			'<code>' . $hostname . '</code>',
 			'<code>www</code>'
 		);
@@ -280,12 +280,12 @@ 
 		</p>
 		<table class="form-table" role="presentation">
 			<tr>
-			<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
+			<th scope='row'><?php esc_html_e('Server Address'); ?></th>
 			<td>
 				<?php
 					printf(
 						/* translators: %s: Host name. */
-						__( 'The internet address of your network will be %s.' ),
+						__('The internet address of your network will be %s.'),
 						'<code>' . $hostname . '</code>'
 					);
 				?>
@@ -294,58 +294,58 @@ 
 		</table>
 		<?php endif; ?>
 
-		<h3><?php esc_html_e( 'Network Details' ); ?></h3>
+		<h3><?php esc_html_e('Network Details'); ?></h3>
 		<table class="form-table" role="presentation">
-		<?php if ( 'localhost' === $hostname ) : ?>
+		<?php if ('localhost' === $hostname) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
+				<th scope="row"><?php esc_html_e('Sub-directory Installation'); ?></th>
 				<td>
 				<?php
 					printf(
 						/* translators: 1: localhost, 2: localhost.localdomain */
-						__( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
+						__('Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.'),
 						'<code>localhost</code>',
 						'<code>localhost.localdomain</code>'
 					);
 					// Uh oh:
-				if ( ! allow_subdirectory_install() ) {
-					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				if (!allow_subdirectory_install()) {
+					echo ' <strong>' . __('Warning:') . ' ' . __('The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.') . '</strong>';
 				}
 				?>
 				</td>
 			</tr>
-		<?php elseif ( ! allow_subdomain_install() ) : ?>
+		<?php elseif (!allow_subdomain_install()) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
+				<th scope="row"><?php esc_html_e('Sub-directory Installation'); ?></th>
 				<td>
 				<?php
-					_e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
+					_e('Because your installation is in a directory, the sites in your WordPress network must use sub-directories.');
 					// Uh oh:
-				if ( ! allow_subdirectory_install() ) {
-					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				if (!allow_subdirectory_install()) {
+					echo ' <strong>' . __('Warning:') . ' ' . __('The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.') . '</strong>';
 				}
 				?>
 				</td>
 			</tr>
-		<?php elseif ( ! allow_subdirectory_install() ) : ?>
+		<?php elseif (!allow_subdirectory_install()) : ?>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
+				<th scope="row"><?php esc_html_e('Sub-domain Installation'); ?></th>
 				<td>
 				<?php
-				_e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
-					echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				_e('Because your installation is not new, the sites in your WordPress network must use sub-domains.');
+					echo ' <strong>' . __('The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.') . '</strong>';
 				?>
 				</td>
 			</tr>
 		<?php endif; ?>
-		<?php if ( ! $is_www ) : ?>
+		<?php if (!$is_www) : ?>
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
+				<th scope='row'><?php esc_html_e('Server Address'); ?></th>
 				<td>
 					<?php
 					printf(
 						/* translators: %s: Host name. */
-						__( 'The internet address of your network will be %s.' ),
+						__('The internet address of your network will be %s.'),
 						'<code>' . $hostname . '</code>'
 					);
 					?>
@@ -353,25 +353,25 @@ 
 			</tr>
 		<?php endif; ?>
 			<tr>
-				<th scope='row'><label for="sitename"><?php esc_html_e( 'Network Title' ); ?></label></th>
+				<th scope='row'><label for="sitename"><?php esc_html_e('Network Title'); ?></label></th>
 				<td>
-					<input name='sitename' id='sitename' type='text' size='45' value='<?php echo esc_attr( $site_name ); ?>' />
+					<input name='sitename' id='sitename' type='text' size='45' value='<?php echo esc_attr($site_name); ?>' />
 					<p class="description">
-						<?php _e( 'What would you like to call your network?' ); ?>
+						<?php _e('What would you like to call your network?'); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope='row'><label for="email"><?php esc_html_e( 'Network Admin Email' ); ?></label></th>
+				<th scope='row'><label for="email"><?php esc_html_e('Network Admin Email'); ?></label></th>
 				<td>
-					<input name='email' id='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' />
+					<input name='email' id='email' type='text' size='45' value='<?php echo esc_attr($admin_email); ?>' />
 					<p class="description">
-						<?php _e( 'Your email address.' ); ?>
+						<?php _e('Your email address.'); ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<?php submit_button( __( 'Install' ), 'primary', 'submit' ); ?>
+		<?php submit_button(__('Install'), 'primary', 'submit'); ?>
 	</form>
 	<?php
 }
@@ -386,46 +386,46 @@ 
  *
  * @param false|WP_Error $errors Optional. Error object. Default false.
  */
-function network_step2( $errors = false ) {
+function network_step2($errors = false) {
 	global $wpdb, $is_nginx;
 
 	$hostname          = get_clean_basedomain();
-	$slashed_home      = trailingslashit( get_option( 'home' ) );
-	$base              = parse_url( $slashed_home, PHP_URL_PATH );
-	$document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
-	$abspath_fix       = str_replace( '\\', '/', ABSPATH );
-	$home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
-	$wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
-	$rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
+	$slashed_home      = trailingslashit(get_option('home'));
+	$base              = parse_url($slashed_home, PHP_URL_PATH);
+	$document_root_fix = str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']));
+	$abspath_fix       = str_replace('\\', '/', ABSPATH);
+	$home_path         = 0 === strpos($abspath_fix, $document_root_fix) ? $document_root_fix . $base : get_home_path();
+	$wp_siteurl_subdir = preg_replace('#^' . preg_quote($home_path, '#') . '#', '', $abspath_fix);
+	$rewrite_base      = !empty($wp_siteurl_subdir) ? ltrim(trailingslashit($wp_siteurl_subdir), '/') : '';
 
 	$location_of_wp_config = $abspath_fix;
-	if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) {
-		$location_of_wp_config = dirname( $abspath_fix );
+	if (!file_exists(ABSPATH . 'wp-config.php') && file_exists(dirname(ABSPATH) . '/wp-config.php')) {
+		$location_of_wp_config = dirname($abspath_fix);
 	}
-	$location_of_wp_config = trailingslashit( $location_of_wp_config );
+	$location_of_wp_config = trailingslashit($location_of_wp_config);
 
 	// Wildcard DNS message.
-	if ( is_wp_error( $errors ) ) {
+	if (is_wp_error($errors)) {
 		echo '<div class="error">' . $errors->get_error_message() . '</div>';
 	}
 
-	if ( $_POST ) {
-		if ( allow_subdomain_install() ) {
-			$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
+	if ($_POST) {
+		if (allow_subdomain_install()) {
+			$subdomain_install = allow_subdirectory_install() ? !empty($_POST['subdomain_install']) : true;
 		} else {
 			$subdomain_install = false;
 		}
 	} else {
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$subdomain_install = is_subdomain_install();
 			?>
-	<p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
+	<p><?php _e('The original configuration steps are shown here for reference.'); ?></p>
 			<?php
 		} else {
-			$subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+			$subdomain_install = (bool) $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'");
 			?>
-	<div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
-	<p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
+	<div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e('An existing WordPress network was detected.'); ?></p></div>
+	<p><?php _e('Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.'); ?></p>
 			<?php
 		}
 	}
@@ -434,33 +434,33 @@ 
 	$subdir_replacement_01 = $subdomain_install ? '' : '$1';
 	$subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
 
-	if ( $_POST || ! is_multisite() ) {
+	if ($_POST || !is_multisite()) {
 		?>
-		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
-		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
+		<h3><?php esc_html_e('Enabling the Network'); ?></h3>
+		<p><?php _e('Complete the following steps to enable the features for creating a network of sites.'); ?></p>
 		<div class="notice notice-warning inline"><p>
 		<?php
-		if ( file_exists( $home_path . '.htaccess' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+		if (file_exists($home_path . '.htaccess')) {
+			echo '<strong>' . __('Caution:') . '</strong> ';
 			printf(
 				/* translators: 1: wp-config.php, 2: .htaccess */
-				__( 'You should back up your existing %1$s and %2$s files.' ),
+				__('You should back up your existing %1$s and %2$s files.'),
 				'<code>wp-config.php</code>',
 				'<code>.htaccess</code>'
 			);
-		} elseif ( file_exists( $home_path . 'web.config' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+		} elseif (file_exists($home_path . 'web.config')) {
+			echo '<strong>' . __('Caution:') . '</strong> ';
 			printf(
 				/* translators: 1: wp-config.php, 2: web.config */
-				__( 'You should back up your existing %1$s and %2$s files.' ),
+				__('You should back up your existing %1$s and %2$s files.'),
 				'<code>wp-config.php</code>',
 				'<code>web.config</code>'
 			);
 		} else {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+			echo '<strong>' . __('Caution:') . '</strong> ';
 			printf(
 				/* translators: %s: wp-config.php */
-				__( 'You should back up your existing %s file.' ),
+				__('You should back up your existing %s file.'),
 				'<code>wp-config.php</code>'
 			);
 		}
@@ -474,7 +474,7 @@ 
 		<?php
 		printf(
 			/* translators: 1: wp-config.php, 2: Location of wp-config file, 3: Translated version of "That's all, stop editing! Happy publishing." */
-			__( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
+			__('Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:'),
 			'<code>wp-config.php</code>',
 			'<code>' . $location_of_wp_config . '</code>',
 			/*
@@ -482,7 +482,7 @@ 
 			 * You can check the localized release package or
 			 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
 			 */
-			'<code>/* ' . __( 'That&#8217;s all, stop editing! Happy publishing.' ) . ' */</code>'
+			'<code>/* ' . __('That&#8217;s all, stop editing! Happy publishing.') . ' */</code>'
 		);
 		?>
 		</p>
@@ -505,55 +505,55 @@ 
 			'LOGGED_IN_SALT'   => '',
 			'NONCE_SALT'       => '',
 		);
-		foreach ( $keys_salts as $c => $v ) {
-			if ( defined( $c ) ) {
-				unset( $keys_salts[ $c ] );
+		foreach ($keys_salts as $c => $v) {
+			if (defined($c)) {
+				unset($keys_salts[$c]);
 			}
 		}
 
-		if ( ! empty( $keys_salts ) ) {
+		if (!empty($keys_salts)) {
 			$keys_salts_str = '';
-			$from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-			if ( is_wp_error( $from_api ) ) {
-				foreach ( $keys_salts as $c => $v ) {
-					$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+			$from_api       = wp_remote_get('https://api.wordpress.org/secret-key/1.1/salt/');
+			if (is_wp_error($from_api)) {
+				foreach ($keys_salts as $c => $v) {
+					$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password(64, true, true) . "' );";
 				}
 			} else {
-				$from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
-				foreach ( $keys_salts as $c => $v ) {
-					$keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+				$from_api = explode("\n", wp_remote_retrieve_body($from_api));
+				foreach ($keys_salts as $c => $v) {
+					$keys_salts_str .= "\ndefine( '$c', '" . substr(array_shift($from_api), 28, 64) . "' );";
 				}
 			}
-			$num_keys_salts = count( $keys_salts );
+			$num_keys_salts = count($keys_salts);
 			?>
 		<p>
 			<?php
-			if ( 1 === $num_keys_salts ) {
+			if (1 === $num_keys_salts) {
 				printf(
 					/* translators: %s: wp-config.php */
-					__( 'This unique authentication key is also missing from your %s file.' ),
+					__('This unique authentication key is also missing from your %s file.'),
 					'<code>wp-config.php</code>'
 				);
 			} else {
 				printf(
 					/* translators: %s: wp-config.php */
-					__( 'These unique authentication keys are also missing from your %s file.' ),
+					__('These unique authentication keys are also missing from your %s file.'),
 					'<code>wp-config.php</code>'
 				);
 			}
 			?>
-			<?php _e( 'To make your installation more secure, you should also add:' ); ?>
+			<?php _e('To make your installation more secure, you should also add:'); ?>
 		</p>
-		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
+		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea($keys_salts_str); ?></textarea>
 			<?php
 		}
 		?>
 		</li>
 	<?php
-	if ( iis7_supports_permalinks() ) :
+	if (iis7_supports_permalinks()) :
 		// IIS doesn't support RewriteBase, all your RewriteBase are belong to us.
-		$iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
-		$iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
+		$iis_subdir_match       = ltrim($base, '/') . $subdir_match;
+		$iis_rewrite_base       = ltrim($base, '/') . $rewrite_base;
 		$iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
 
 		$web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
@@ -565,7 +565,7 @@ 
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
                 </rule>';
-		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+		if (is_multisite() && get_site_option('ms_files_rewriting')) {
 			$web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
@@ -606,34 +606,34 @@ 
 			echo '<li><p>';
 			printf(
 				/* translators: 1: File name (.htaccess or web.config), 2: File path. */
-				__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+				__('Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:'),
 				'<code>web.config</code>',
 				'<code>' . $home_path . '</code>'
 			);
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
-			echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if (!$subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content') {
+			echo '<p><strong>' . __('Warning:') . ' ' . __('Subdirectory networks may not be fully compatible with custom wp-content directories.') . '</strong></p>';
 		}
 		?>
-		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?></textarea>
+		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea($web_config_file); ?></textarea>
 		</li>
 	</ol>
 
 		<?php
-	elseif ( $is_nginx ) : // End iis7_supports_permalinks(). Link to Nginx documentation instead:
+	elseif ($is_nginx) : // End iis7_supports_permalinks(). Link to Nginx documentation instead:
 
 		echo '<li><p>';
 		printf(
 			/* translators: %s: Documentation URL. */
-			__( 'It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.' ),
-			__( 'https://wordpress.org/support/article/nginx/' )
+			__('It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.'),
+			__('https://wordpress.org/support/article/nginx/')
 		);
 		echo '</p></li>';
 
 	else : // End $is_nginx. Construct an .htaccess file instead:
 
 		$ms_files_rewriting = '';
-		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+		if (is_multisite() && get_site_option('ms_files_rewriting')) {
 			$ms_files_rewriting  = "\n# uploaded files\nRewriteRule ^";
 			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
 		}
@@ -659,25 +659,25 @@ 
 		echo '<li><p>';
 		printf(
 			/* translators: 1: File name (.htaccess or web.config), 2: File path. */
-			__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+			__('Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:'),
 			'<code>.htaccess</code>',
 			'<code>' . $home_path . '</code>'
 		);
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content' ) {
-			echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		if (!$subdomain_install && WP_CONTENT_DIR !== ABSPATH . 'wp-content') {
+			echo '<p><strong>' . __('Warning:') . ' ' . __('Subdirectory networks may not be fully compatible with custom wp-content directories.') . '</strong></p>';
 		}
 		?>
-		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>"><?php echo esc_textarea( $htaccess_file ); ?></textarea>
+		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count($htaccess_file, "\n") + 1; ?>"><?php echo esc_textarea($htaccess_file); ?></textarea>
 		</li>
 	</ol>
 
 		<?php
 	endif; // End IIS/Nginx/Apache code branches.
 
-	if ( ! is_multisite() ) {
+	if (!is_multisite()) {
 		?>
-		<p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
+		<p><?php _e('Once you complete these steps, your network is enabled and configured. You will have to log in again.'); ?> <a href="<?php echo esc_url(wp_login_url()); ?>"><?php _e('Log In'); ?></a></p>
 		<?php
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -630,9 +630,11 @@
 		);
 		echo '</p></li>';
 
-	else : // End $is_nginx. Construct an .htaccess file instead:
+	else {
+	    : // End $is_nginx. Construct an .htaccess file instead:
 
 		$ms_files_rewriting = '';
+	}
 		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
 			$ms_files_rewriting  = "\n# uploaded files\nRewriteRule ^";
 			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";

brighty/wp-admin/includes/class-wp-automatic-updater.php

Indentation +1425 added lines, -1425 removed lines

@@ -15,605 +15,605 @@ 
  */
 class WP_Automatic_Updater {
 
-	/**
-	 * Tracks update results during processing.
-	 *
-	 * @var array
-	 */
-	protected $update_results = array();
-
-	/**
-	 * Determines whether the entire automatic updater is disabled.
-	 *
-	 * @since 3.7.0
-	 */
-	public function is_disabled() {
-		// Background updates are disabled if you don't want file changes.
-		if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) ) {
-			return true;
-		}
-
-		if ( wp_installing() ) {
-			return true;
-		}
-
-		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
-		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
-
-		/**
-		 * Filters whether to entirely disable background updates.
-		 *
-		 * There are more fine-grained filters and controls for selective disabling.
-		 * This filter parallels the AUTOMATIC_UPDATER_DISABLED constant in name.
-		 *
-		 * This also disables update notification emails. That may change in the future.
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param bool $disabled Whether the updater should be disabled.
-		 */
-		return apply_filters( 'automatic_updater_disabled', $disabled );
-	}
-
-	/**
-	 * Checks for version control checkouts.
-	 *
-	 * Checks for Subversion, Git, Mercurial, and Bazaar. It recursively looks up the
-	 * filesystem to the top of the drive, erring on the side of detecting a VCS
-	 * checkout somewhere.
-	 *
-	 * ABSPATH is always checked in addition to whatever `$context` is (which may be the
-	 * wp-content directory, for example). The underlying assumption is that if you are
-	 * using version control *anywhere*, then you should be making decisions for
-	 * how things get updated.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param string $context The filesystem path to check, in addition to ABSPATH.
-	 * @return bool True if a VCS checkout was discovered at `$context` or ABSPATH,
-	 *              or anywhere higher. False otherwise.
-	 */
-	public function is_vcs_checkout( $context ) {
-		$context_dirs = array( untrailingslashit( $context ) );
-		if ( ABSPATH !== $context ) {
-			$context_dirs[] = untrailingslashit( ABSPATH );
-		}
-
-		$vcs_dirs   = array( '.svn', '.git', '.hg', '.bzr' );
-		$check_dirs = array();
-
-		foreach ( $context_dirs as $context_dir ) {
-			// Walk up from $context_dir to the root.
-			do {
-				$check_dirs[] = $context_dir;
-
-				// Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
-				if ( dirname( $context_dir ) === $context_dir ) {
-					break;
-				}
-
-				// Continue one level at a time.
-			} while ( $context_dir = dirname( $context_dir ) );
-		}
-
-		$check_dirs = array_unique( $check_dirs );
-
-		// Search all directories we've found for evidence of version control.
-		foreach ( $vcs_dirs as $vcs_dir ) {
-			foreach ( $check_dirs as $check_dir ) {
-				$checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
-				if ( $checkout ) {
-					break 2;
-				}
-			}
-		}
-
-		/**
-		 * Filters whether the automatic updater should consider a filesystem
-		 * location to be potentially managed by a version control system.
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param bool $checkout  Whether a VCS checkout was discovered at `$context`
-		 *                        or ABSPATH, or anywhere higher.
-		 * @param string $context The filesystem context (a path) against which
-		 *                        filesystem status should be checked.
-		 */
-		return apply_filters( 'automatic_updates_is_vcs_checkout', $checkout, $context );
-	}
-
-	/**
-	 * Tests to see if we can and should update a specific item.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param string $type    The type of update being checked: 'core', 'theme',
-	 *                        'plugin', 'translation'.
-	 * @param object $item    The update offer.
-	 * @param string $context The filesystem context (a path) against which filesystem
-	 *                        access and status should be checked.
-	 * @return bool True if the item should be updated, false otherwise.
-	 */
-	public function should_update( $type, $item, $context ) {
-		// Used to see if WP_Filesystem is set up to allow unattended updates.
-		$skin = new Automatic_Upgrader_Skin;
-
-		if ( $this->is_disabled() ) {
-			return false;
-		}
-
-		// Only relax the filesystem checks when the update doesn't include new files.
-		$allow_relaxed_file_ownership = false;
-		if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
-			$allow_relaxed_file_ownership = true;
-		}
-
-		// If we can't do an auto core update, we may still be able to email the user.
-		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership )
-			|| $this->is_vcs_checkout( $context )
-		) {
-			if ( 'core' === $type ) {
-				$this->send_core_update_notification_email( $item );
-			}
-			return false;
-		}
-
-		// Next up, is this an item we can update?
-		if ( 'core' === $type ) {
-			$update = Core_Upgrader::should_update_to_version( $item->current );
-		} elseif ( 'plugin' === $type || 'theme' === $type ) {
-			$update = ! empty( $item->autoupdate );
-
-			if ( ! $update && wp_is_auto_update_enabled_for_type( $type ) ) {
-				// Check if the site admin has enabled auto-updates by default for the specific item.
-				$auto_updates = (array) get_site_option( "auto_update_{$type}s", array() );
-				$update       = in_array( $item->{$type}, $auto_updates, true );
-			}
-		} else {
-			$update = ! empty( $item->autoupdate );
-		}
-
-		// If the `disable_autoupdate` flag is set, override any user-choice, but allow filters.
-		if ( ! empty( $item->disable_autoupdate ) ) {
-			$update = $item->disable_autoupdate;
-		}
-
-		/**
-		 * Filters whether to automatically update core, a plugin, a theme, or a language.
-		 *
-		 * The dynamic portion of the hook name, `$type`, refers to the type of update
-		 * being checked.
-		 *
-		 * Possible hook names include:
-		 *
-		 *  - `auto_update_core`
-		 *  - `auto_update_plugin`
-		 *  - `auto_update_theme`
-		 *  - `auto_update_translation`
-		 *
-		 * Since WordPress 3.7, minor and development versions of core, and translations have
-		 * been auto-updated by default. New installs on WordPress 5.6 or higher will also
-		 * auto-update major versions by default. Starting in 5.6, older sites can opt-in to
-		 * major version auto-updates, and auto-updates for plugins and themes.
-		 *
-		 * See the {@see 'allow_dev_auto_core_updates'}, {@see 'allow_minor_auto_core_updates'},
-		 * and {@see 'allow_major_auto_core_updates'} filters for a more straightforward way to
-		 * adjust core updates.
-		 *
-		 * @since 3.7.0
-		 * @since 5.5.0 The `$update` parameter accepts the value of null.
-		 *
-		 * @param bool|null $update Whether to update. The value of null is internally used
-		 *                          to detect whether nothing has hooked into this filter.
-		 * @param object    $item   The update offer.
-		 */
-		$update = apply_filters( "auto_update_{$type}", $update, $item );
-
-		if ( ! $update ) {
-			if ( 'core' === $type ) {
-				$this->send_core_update_notification_email( $item );
-			}
-			return false;
-		}
-
-		// If it's a core update, are we actually compatible with its requirements?
-		if ( 'core' === $type ) {
-			global $wpdb;
-
-			$php_compat = version_compare( phpversion(), $item->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
-				$mysql_compat = true;
-			} else {
-				$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
-			}
-
-			if ( ! $php_compat || ! $mysql_compat ) {
-				return false;
-			}
-		}
-
-		// If updating a plugin or theme, ensure the minimum PHP version requirements are satisfied.
-		if ( in_array( $type, array( 'plugin', 'theme' ), true ) ) {
-			if ( ! empty( $item->requires_php ) && version_compare( phpversion(), $item->requires_php, '<' ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Notifies an administrator of a core update.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param object $item The update offer.
-	 * @return bool True if the site administrator is notified of a core update,
-	 *              false otherwise.
-	 */
-	protected function send_core_update_notification_email( $item ) {
-		$notified = get_site_option( 'auto_core_update_notified' );
-
-		// Don't notify if we've already notified the same email address of the same version.
-		if ( $notified
-			&& get_site_option( 'admin_email' ) === $notified['email']
-			&& $notified['version'] === $item->current
-		) {
-			return false;
-		}
-
-		// See if we need to notify users of a core update.
-		$notify = ! empty( $item->notify_email );
-
-		/**
-		 * Filters whether to notify the site administrator of a new core update.
-		 *
-		 * By default, administrators are notified when the update offer received
-		 * from WordPress.org sets a particular flag. This allows some discretion
-		 * in if and when to notify.
-		 *
-		 * This filter is only evaluated once per release. If the same email address
-		 * was already notified of the same new version, WordPress won't repeatedly
-		 * email the administrator.
-		 *
-		 * This filter is also used on about.php to check if a plugin has disabled
-		 * these notifications.
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param bool   $notify Whether the site administrator is notified.
-		 * @param object $item   The update offer.
-		 */
-		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) ) {
-			return false;
-		}
-
-		$this->send_email( 'manual', $item );
-		return true;
-	}
-
-	/**
-	 * Updates an item, if appropriate.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param string $type The type of update being checked: 'core', 'theme', 'plugin', 'translation'.
-	 * @param object $item The update offer.
-	 * @return null|WP_Error
-	 */
-	public function update( $type, $item ) {
-		$skin = new Automatic_Upgrader_Skin;
-
-		switch ( $type ) {
-			case 'core':
-				// The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter.
-				add_filter( 'update_feedback', array( $skin, 'feedback' ) );
-				$upgrader = new Core_Upgrader( $skin );
-				$context  = ABSPATH;
-				break;
-			case 'plugin':
-				$upgrader = new Plugin_Upgrader( $skin );
-				$context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR.
-				break;
-			case 'theme':
-				$upgrader = new Theme_Upgrader( $skin );
-				$context  = get_theme_root( $item->theme );
-				break;
-			case 'translation':
-				$upgrader = new Language_Pack_Upgrader( $skin );
-				$context  = WP_CONTENT_DIR; // WP_LANG_DIR;
-				break;
-		}
-
-		// Determine whether we can and should perform this update.
-		if ( ! $this->should_update( $type, $item, $context ) ) {
-			return false;
-		}
-
-		/**
-		 * Fires immediately prior to an auto-update.
-		 *
-		 * @since 4.4.0
-		 *
-		 * @param string $type    The type of update being checked: 'core', 'theme', 'plugin', or 'translation'.
-		 * @param object $item    The update offer.
-		 * @param string $context The filesystem context (a path) against which filesystem access and status
-		 *                        should be checked.
-		 */
-		do_action( 'pre_auto_update', $type, $item, $context );
-
-		$upgrader_item = $item;
-		switch ( $type ) {
-			case 'core':
-				/* translators: %s: WordPress version. */
-				$skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
-				/* translators: %s: WordPress version. */
-				$item_name = sprintf( __( 'WordPress %s' ), $item->version );
-				break;
-			case 'theme':
-				$upgrader_item = $item->theme;
-				$theme         = wp_get_theme( $upgrader_item );
-				$item_name     = $theme->Get( 'Name' );
-				// Add the current version so that it can be reported in the notification email.
-				$item->current_version = $theme->get( 'Version' );
-				if ( empty( $item->current_version ) ) {
-					$item->current_version = false;
-				}
-				/* translators: %s: Theme name. */
-				$skin->feedback( __( 'Updating theme: %s' ), $item_name );
-				break;
-			case 'plugin':
-				$upgrader_item = $item->plugin;
-				$plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
-				$item_name     = $plugin_data['Name'];
-				// Add the current version so that it can be reported in the notification email.
-				$item->current_version = $plugin_data['Version'];
-				if ( empty( $item->current_version ) ) {
-					$item->current_version = false;
-				}
-				/* translators: %s: Plugin name. */
-				$skin->feedback( __( 'Updating plugin: %s' ), $item_name );
-				break;
-			case 'translation':
-				$language_item_name = $upgrader->get_name_for_update( $item );
-				/* translators: %s: Project name (plugin, theme, or WordPress). */
-				$item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
-				/* translators: 1: Project name (plugin, theme, or WordPress), 2: Language. */
-				$skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)&#8230;' ), $language_item_name, $item->language ) );
-				break;
-		}
-
-		$allow_relaxed_file_ownership = false;
-		if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
-			$allow_relaxed_file_ownership = true;
-		}
-
-		// Boom, this site's about to get a whole new splash of paint!
-		$upgrade_result = $upgrader->upgrade(
-			$upgrader_item,
-			array(
-				'clear_update_cache'           => false,
-				// Always use partial builds if possible for core updates.
-				'pre_check_md5'                => false,
-				// Only available for core updates.
-				'attempt_rollback'             => true,
-				// Allow relaxed file ownership in some scenarios.
-				'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
-			)
-		);
-
-		// If the filesystem is unavailable, false is returned.
-		if ( false === $upgrade_result ) {
-			$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
-		}
-
-		if ( 'core' === $type ) {
-			if ( is_wp_error( $upgrade_result )
-				&& ( 'up_to_date' === $upgrade_result->get_error_code()
-					|| 'locked' === $upgrade_result->get_error_code() )
-			) {
-				// These aren't actual errors, treat it as a skipped-update instead
-				// to avoid triggering the post-core update failure routines.
-				return false;
-			}
-
-			// Core doesn't output this, so let's append it, so we don't get confused.
-			if ( is_wp_error( $upgrade_result ) ) {
-				$upgrade_result->add( 'installation_failed', __( 'Installation failed.' ) );
-				$skin->error( $upgrade_result );
-			} else {
-				$skin->feedback( __( 'WordPress updated successfully.' ) );
-			}
-		}
-
-		$this->update_results[ $type ][] = (object) array(
-			'item'     => $item,
-			'result'   => $upgrade_result,
-			'name'     => $item_name,
-			'messages' => $skin->get_upgrade_messages(),
-		);
-
-		return $upgrade_result;
-	}
-
-	/**
-	 * Kicks off the background update process, looping through all pending updates.
-	 *
-	 * @since 3.7.0
-	 */
-	public function run() {
-		if ( $this->is_disabled() ) {
-			return;
-		}
-
-		if ( ! is_main_network() || ! is_main_site() ) {
-			return;
-		}
-
-		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) ) {
-			return;
-		}
-
-		// Don't automatically run these things, as we'll handle it ourselves.
-		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-		remove_action( 'upgrader_process_complete', 'wp_version_check' );
-		remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
-		remove_action( 'upgrader_process_complete', 'wp_update_themes' );
-
-		// Next, plugins.
-		wp_update_plugins(); // Check for plugin updates.
-		$plugin_updates = get_site_transient( 'update_plugins' );
-		if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
-			foreach ( $plugin_updates->response as $plugin ) {
-				$this->update( 'plugin', $plugin );
-			}
-			// Force refresh of plugin update information.
-			wp_clean_plugins_cache();
-		}
-
-		// Next, those themes we all love.
-		wp_update_themes();  // Check for theme updates.
-		$theme_updates = get_site_transient( 'update_themes' );
-		if ( $theme_updates && ! empty( $theme_updates->response ) ) {
-			foreach ( $theme_updates->response as $theme ) {
-				$this->update( 'theme', (object) $theme );
-			}
-			// Force refresh of theme update information.
-			wp_clean_themes_cache();
-		}
-
-		// Next, process any core update.
-		wp_version_check(); // Check for core updates.
-		$core_update = find_core_auto_update();
-
-		if ( $core_update ) {
-			$this->update( 'core', $core_update );
-		}
-
-		// Clean up, and check for any pending translations.
-		// (Core_Upgrader checks for core updates.)
-		$theme_stats = array();
-		if ( isset( $this->update_results['theme'] ) ) {
-			foreach ( $this->update_results['theme'] as $upgrade ) {
-				$theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
-			}
-		}
-		wp_update_themes( $theme_stats ); // Check for theme updates.
-
-		$plugin_stats = array();
-		if ( isset( $this->update_results['plugin'] ) ) {
-			foreach ( $this->update_results['plugin'] as $upgrade ) {
-				$plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
-			}
-		}
-		wp_update_plugins( $plugin_stats ); // Check for plugin updates.
-
-		// Finally, process any new translations.
-		$language_updates = wp_get_translation_updates();
-		if ( $language_updates ) {
-			foreach ( $language_updates as $update ) {
-				$this->update( 'translation', $update );
-			}
-
-			// Clear existing caches.
-			wp_clean_update_cache();
-
-			wp_version_check();  // Check for core updates.
-			wp_update_themes();  // Check for theme updates.
-			wp_update_plugins(); // Check for plugin updates.
-		}
-
-		// Send debugging email to admin for all development installations.
-		if ( ! empty( $this->update_results ) ) {
-			$development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
-
-			/**
-			 * Filters whether to send a debugging email for each automatic background update.
-			 *
-			 * @since 3.7.0
-			 *
-			 * @param bool $development_version By default, emails are sent if the
-			 *                                  install is a development version.
-			 *                                  Return false to avoid the email.
-			 */
-			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) ) {
-				$this->send_debug_email();
-			}
-
-			if ( ! empty( $this->update_results['core'] ) ) {
-				$this->after_core_update( $this->update_results['core'][0] );
-			} elseif ( ! empty( $this->update_results['plugin'] ) || ! empty( $this->update_results['theme'] ) ) {
-				$this->after_plugin_theme_update( $this->update_results );
-			}
-
-			/**
-			 * Fires after all automatic updates have run.
-			 *
-			 * @since 3.8.0
-			 *
-			 * @param array $update_results The results of all attempted updates.
-			 */
-			do_action( 'automatic_updates_complete', $this->update_results );
-		}
-
-		WP_Upgrader::release_lock( 'auto_updater' );
-	}
-
-	/**
-	 * If we tried to perform a core update, check if we should send an email,
-	 * and if we need to avoid processing future updates.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param object $update_result The result of the core update. Includes the update offer and result.
-	 */
-	protected function after_core_update( $update_result ) {
-		$wp_version = get_bloginfo( 'version' );
-
-		$core_update = $update_result->item;
-		$result      = $update_result->result;
-
-		if ( ! is_wp_error( $result ) ) {
-			$this->send_email( 'success', $core_update );
-			return;
-		}
-
-		$error_code = $result->get_error_code();
-
-		// Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
-		// We should not try to perform a background update again until there is a successful one-click update performed by the user.
-		$critical = false;
-		if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
-			$critical = true;
-		} elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
-			// A rollback is only critical if it failed too.
-			$critical        = true;
-			$rollback_result = $result->get_error_data()->rollback;
-		} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
-			$critical = true;
-		}
-
-		if ( $critical ) {
-			$critical_data = array(
-				'attempted'  => $core_update->current,
-				'current'    => $wp_version,
-				'error_code' => $error_code,
-				'error_data' => $result->get_error_data(),
-				'timestamp'  => time(),
-				'critical'   => true,
-			);
-			if ( isset( $rollback_result ) ) {
-				$critical_data['rollback_code'] = $rollback_result->get_error_code();
-				$critical_data['rollback_data'] = $rollback_result->get_error_data();
-			}
-			update_site_option( 'auto_core_update_failed', $critical_data );
-			$this->send_email( 'critical', $core_update, $result );
-			return;
-		}
-
-		/*
+    /**
+     * Tracks update results during processing.
+     *
+     * @var array
+     */
+    protected $update_results = array();
+
+    /**
+     * Determines whether the entire automatic updater is disabled.
+     *
+     * @since 3.7.0
+     */
+    public function is_disabled() {
+        // Background updates are disabled if you don't want file changes.
+        if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) ) {
+            return true;
+        }
+
+        if ( wp_installing() ) {
+            return true;
+        }
+
+        // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
+        $disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
+
+        /**
+         * Filters whether to entirely disable background updates.
+         *
+         * There are more fine-grained filters and controls for selective disabling.
+         * This filter parallels the AUTOMATIC_UPDATER_DISABLED constant in name.
+         *
+         * This also disables update notification emails. That may change in the future.
+         *
+         * @since 3.7.0
+         *
+         * @param bool $disabled Whether the updater should be disabled.
+         */
+        return apply_filters( 'automatic_updater_disabled', $disabled );
+    }
+
+    /**
+     * Checks for version control checkouts.
+     *
+     * Checks for Subversion, Git, Mercurial, and Bazaar. It recursively looks up the
+     * filesystem to the top of the drive, erring on the side of detecting a VCS
+     * checkout somewhere.
+     *
+     * ABSPATH is always checked in addition to whatever `$context` is (which may be the
+     * wp-content directory, for example). The underlying assumption is that if you are
+     * using version control *anywhere*, then you should be making decisions for
+     * how things get updated.
+     *
+     * @since 3.7.0
+     *
+     * @param string $context The filesystem path to check, in addition to ABSPATH.
+     * @return bool True if a VCS checkout was discovered at `$context` or ABSPATH,
+     *              or anywhere higher. False otherwise.
+     */
+    public function is_vcs_checkout( $context ) {
+        $context_dirs = array( untrailingslashit( $context ) );
+        if ( ABSPATH !== $context ) {
+            $context_dirs[] = untrailingslashit( ABSPATH );
+        }
+
+        $vcs_dirs   = array( '.svn', '.git', '.hg', '.bzr' );
+        $check_dirs = array();
+
+        foreach ( $context_dirs as $context_dir ) {
+            // Walk up from $context_dir to the root.
+            do {
+                $check_dirs[] = $context_dir;
+
+                // Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
+                if ( dirname( $context_dir ) === $context_dir ) {
+                    break;
+                }
+
+                // Continue one level at a time.
+            } while ( $context_dir = dirname( $context_dir ) );
+        }
+
+        $check_dirs = array_unique( $check_dirs );
+
+        // Search all directories we've found for evidence of version control.
+        foreach ( $vcs_dirs as $vcs_dir ) {
+            foreach ( $check_dirs as $check_dir ) {
+                $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
+                if ( $checkout ) {
+                    break 2;
+                }
+            }
+        }
+
+        /**
+         * Filters whether the automatic updater should consider a filesystem
+         * location to be potentially managed by a version control system.
+         *
+         * @since 3.7.0
+         *
+         * @param bool $checkout  Whether a VCS checkout was discovered at `$context`
+         *                        or ABSPATH, or anywhere higher.
+         * @param string $context The filesystem context (a path) against which
+         *                        filesystem status should be checked.
+         */
+        return apply_filters( 'automatic_updates_is_vcs_checkout', $checkout, $context );
+    }
+
+    /**
+     * Tests to see if we can and should update a specific item.
+     *
+     * @since 3.7.0
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
+     * @param string $type    The type of update being checked: 'core', 'theme',
+     *                        'plugin', 'translation'.
+     * @param object $item    The update offer.
+     * @param string $context The filesystem context (a path) against which filesystem
+     *                        access and status should be checked.
+     * @return bool True if the item should be updated, false otherwise.
+     */
+    public function should_update( $type, $item, $context ) {
+        // Used to see if WP_Filesystem is set up to allow unattended updates.
+        $skin = new Automatic_Upgrader_Skin;
+
+        if ( $this->is_disabled() ) {
+            return false;
+        }
+
+        // Only relax the filesystem checks when the update doesn't include new files.
+        $allow_relaxed_file_ownership = false;
+        if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
+            $allow_relaxed_file_ownership = true;
+        }
+
+        // If we can't do an auto core update, we may still be able to email the user.
+        if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership )
+            || $this->is_vcs_checkout( $context )
+        ) {
+            if ( 'core' === $type ) {
+                $this->send_core_update_notification_email( $item );
+            }
+            return false;
+        }
+
+        // Next up, is this an item we can update?
+        if ( 'core' === $type ) {
+            $update = Core_Upgrader::should_update_to_version( $item->current );
+        } elseif ( 'plugin' === $type || 'theme' === $type ) {
+            $update = ! empty( $item->autoupdate );
+
+            if ( ! $update && wp_is_auto_update_enabled_for_type( $type ) ) {
+                // Check if the site admin has enabled auto-updates by default for the specific item.
+                $auto_updates = (array) get_site_option( "auto_update_{$type}s", array() );
+                $update       = in_array( $item->{$type}, $auto_updates, true );
+            }
+        } else {
+            $update = ! empty( $item->autoupdate );
+        }
+
+        // If the `disable_autoupdate` flag is set, override any user-choice, but allow filters.
+        if ( ! empty( $item->disable_autoupdate ) ) {
+            $update = $item->disable_autoupdate;
+        }
+
+        /**
+         * Filters whether to automatically update core, a plugin, a theme, or a language.
+         *
+         * The dynamic portion of the hook name, `$type`, refers to the type of update
+         * being checked.
+         *
+         * Possible hook names include:
+         *
+         *  - `auto_update_core`
+         *  - `auto_update_plugin`
+         *  - `auto_update_theme`
+         *  - `auto_update_translation`
+         *
+         * Since WordPress 3.7, minor and development versions of core, and translations have
+         * been auto-updated by default. New installs on WordPress 5.6 or higher will also
+         * auto-update major versions by default. Starting in 5.6, older sites can opt-in to
+         * major version auto-updates, and auto-updates for plugins and themes.
+         *
+         * See the {@see 'allow_dev_auto_core_updates'}, {@see 'allow_minor_auto_core_updates'},
+         * and {@see 'allow_major_auto_core_updates'} filters for a more straightforward way to
+         * adjust core updates.
+         *
+         * @since 3.7.0
+         * @since 5.5.0 The `$update` parameter accepts the value of null.
+         *
+         * @param bool|null $update Whether to update. The value of null is internally used
+         *                          to detect whether nothing has hooked into this filter.
+         * @param object    $item   The update offer.
+         */
+        $update = apply_filters( "auto_update_{$type}", $update, $item );
+
+        if ( ! $update ) {
+            if ( 'core' === $type ) {
+                $this->send_core_update_notification_email( $item );
+            }
+            return false;
+        }
+
+        // If it's a core update, are we actually compatible with its requirements?
+        if ( 'core' === $type ) {
+            global $wpdb;
+
+            $php_compat = version_compare( phpversion(), $item->php_version, '>=' );
+            if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+                $mysql_compat = true;
+            } else {
+                $mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+            }
+
+            if ( ! $php_compat || ! $mysql_compat ) {
+                return false;
+            }
+        }
+
+        // If updating a plugin or theme, ensure the minimum PHP version requirements are satisfied.
+        if ( in_array( $type, array( 'plugin', 'theme' ), true ) ) {
+            if ( ! empty( $item->requires_php ) && version_compare( phpversion(), $item->requires_php, '<' ) ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Notifies an administrator of a core update.
+     *
+     * @since 3.7.0
+     *
+     * @param object $item The update offer.
+     * @return bool True if the site administrator is notified of a core update,
+     *              false otherwise.
+     */
+    protected function send_core_update_notification_email( $item ) {
+        $notified = get_site_option( 'auto_core_update_notified' );
+
+        // Don't notify if we've already notified the same email address of the same version.
+        if ( $notified
+            && get_site_option( 'admin_email' ) === $notified['email']
+            && $notified['version'] === $item->current
+        ) {
+            return false;
+        }
+
+        // See if we need to notify users of a core update.
+        $notify = ! empty( $item->notify_email );
+
+        /**
+         * Filters whether to notify the site administrator of a new core update.
+         *
+         * By default, administrators are notified when the update offer received
+         * from WordPress.org sets a particular flag. This allows some discretion
+         * in if and when to notify.
+         *
+         * This filter is only evaluated once per release. If the same email address
+         * was already notified of the same new version, WordPress won't repeatedly
+         * email the administrator.
+         *
+         * This filter is also used on about.php to check if a plugin has disabled
+         * these notifications.
+         *
+         * @since 3.7.0
+         *
+         * @param bool   $notify Whether the site administrator is notified.
+         * @param object $item   The update offer.
+         */
+        if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) ) {
+            return false;
+        }
+
+        $this->send_email( 'manual', $item );
+        return true;
+    }
+
+    /**
+     * Updates an item, if appropriate.
+     *
+     * @since 3.7.0
+     *
+     * @param string $type The type of update being checked: 'core', 'theme', 'plugin', 'translation'.
+     * @param object $item The update offer.
+     * @return null|WP_Error
+     */
+    public function update( $type, $item ) {
+        $skin = new Automatic_Upgrader_Skin;
+
+        switch ( $type ) {
+            case 'core':
+                // The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter.
+                add_filter( 'update_feedback', array( $skin, 'feedback' ) );
+                $upgrader = new Core_Upgrader( $skin );
+                $context  = ABSPATH;
+                break;
+            case 'plugin':
+                $upgrader = new Plugin_Upgrader( $skin );
+                $context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR.
+                break;
+            case 'theme':
+                $upgrader = new Theme_Upgrader( $skin );
+                $context  = get_theme_root( $item->theme );
+                break;
+            case 'translation':
+                $upgrader = new Language_Pack_Upgrader( $skin );
+                $context  = WP_CONTENT_DIR; // WP_LANG_DIR;
+                break;
+        }
+
+        // Determine whether we can and should perform this update.
+        if ( ! $this->should_update( $type, $item, $context ) ) {
+            return false;
+        }
+
+        /**
+         * Fires immediately prior to an auto-update.
+         *
+         * @since 4.4.0
+         *
+         * @param string $type    The type of update being checked: 'core', 'theme', 'plugin', or 'translation'.
+         * @param object $item    The update offer.
+         * @param string $context The filesystem context (a path) against which filesystem access and status
+         *                        should be checked.
+         */
+        do_action( 'pre_auto_update', $type, $item, $context );
+
+        $upgrader_item = $item;
+        switch ( $type ) {
+            case 'core':
+                /* translators: %s: WordPress version. */
+                $skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
+                /* translators: %s: WordPress version. */
+                $item_name = sprintf( __( 'WordPress %s' ), $item->version );
+                break;
+            case 'theme':
+                $upgrader_item = $item->theme;
+                $theme         = wp_get_theme( $upgrader_item );
+                $item_name     = $theme->Get( 'Name' );
+                // Add the current version so that it can be reported in the notification email.
+                $item->current_version = $theme->get( 'Version' );
+                if ( empty( $item->current_version ) ) {
+                    $item->current_version = false;
+                }
+                /* translators: %s: Theme name. */
+                $skin->feedback( __( 'Updating theme: %s' ), $item_name );
+                break;
+            case 'plugin':
+                $upgrader_item = $item->plugin;
+                $plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
+                $item_name     = $plugin_data['Name'];
+                // Add the current version so that it can be reported in the notification email.
+                $item->current_version = $plugin_data['Version'];
+                if ( empty( $item->current_version ) ) {
+                    $item->current_version = false;
+                }
+                /* translators: %s: Plugin name. */
+                $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
+                break;
+            case 'translation':
+                $language_item_name = $upgrader->get_name_for_update( $item );
+                /* translators: %s: Project name (plugin, theme, or WordPress). */
+                $item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
+                /* translators: 1: Project name (plugin, theme, or WordPress), 2: Language. */
+                $skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)&#8230;' ), $language_item_name, $item->language ) );
+                break;
+        }
+
+        $allow_relaxed_file_ownership = false;
+        if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
+            $allow_relaxed_file_ownership = true;
+        }
+
+        // Boom, this site's about to get a whole new splash of paint!
+        $upgrade_result = $upgrader->upgrade(
+            $upgrader_item,
+            array(
+                'clear_update_cache'           => false,
+                // Always use partial builds if possible for core updates.
+                'pre_check_md5'                => false,
+                // Only available for core updates.
+                'attempt_rollback'             => true,
+                // Allow relaxed file ownership in some scenarios.
+                'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
+            )
+        );
+
+        // If the filesystem is unavailable, false is returned.
+        if ( false === $upgrade_result ) {
+            $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+        }
+
+        if ( 'core' === $type ) {
+            if ( is_wp_error( $upgrade_result )
+                && ( 'up_to_date' === $upgrade_result->get_error_code()
+                    || 'locked' === $upgrade_result->get_error_code() )
+            ) {
+                // These aren't actual errors, treat it as a skipped-update instead
+                // to avoid triggering the post-core update failure routines.
+                return false;
+            }
+
+            // Core doesn't output this, so let's append it, so we don't get confused.
+            if ( is_wp_error( $upgrade_result ) ) {
+                $upgrade_result->add( 'installation_failed', __( 'Installation failed.' ) );
+                $skin->error( $upgrade_result );
+            } else {
+                $skin->feedback( __( 'WordPress updated successfully.' ) );
+            }
+        }
+
+        $this->update_results[ $type ][] = (object) array(
+            'item'     => $item,
+            'result'   => $upgrade_result,
+            'name'     => $item_name,
+            'messages' => $skin->get_upgrade_messages(),
+        );
+
+        return $upgrade_result;
+    }
+
+    /**
+     * Kicks off the background update process, looping through all pending updates.
+     *
+     * @since 3.7.0
+     */
+    public function run() {
+        if ( $this->is_disabled() ) {
+            return;
+        }
+
+        if ( ! is_main_network() || ! is_main_site() ) {
+            return;
+        }
+
+        if ( ! WP_Upgrader::create_lock( 'auto_updater' ) ) {
+            return;
+        }
+
+        // Don't automatically run these things, as we'll handle it ourselves.
+        remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
+        remove_action( 'upgrader_process_complete', 'wp_version_check' );
+        remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
+        remove_action( 'upgrader_process_complete', 'wp_update_themes' );
+
+        // Next, plugins.
+        wp_update_plugins(); // Check for plugin updates.
+        $plugin_updates = get_site_transient( 'update_plugins' );
+        if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
+            foreach ( $plugin_updates->response as $plugin ) {
+                $this->update( 'plugin', $plugin );
+            }
+            // Force refresh of plugin update information.
+            wp_clean_plugins_cache();
+        }
+
+        // Next, those themes we all love.
+        wp_update_themes();  // Check for theme updates.
+        $theme_updates = get_site_transient( 'update_themes' );
+        if ( $theme_updates && ! empty( $theme_updates->response ) ) {
+            foreach ( $theme_updates->response as $theme ) {
+                $this->update( 'theme', (object) $theme );
+            }
+            // Force refresh of theme update information.
+            wp_clean_themes_cache();
+        }
+
+        // Next, process any core update.
+        wp_version_check(); // Check for core updates.
+        $core_update = find_core_auto_update();
+
+        if ( $core_update ) {
+            $this->update( 'core', $core_update );
+        }
+
+        // Clean up, and check for any pending translations.
+        // (Core_Upgrader checks for core updates.)
+        $theme_stats = array();
+        if ( isset( $this->update_results['theme'] ) ) {
+            foreach ( $this->update_results['theme'] as $upgrade ) {
+                $theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
+            }
+        }
+        wp_update_themes( $theme_stats ); // Check for theme updates.
+
+        $plugin_stats = array();
+        if ( isset( $this->update_results['plugin'] ) ) {
+            foreach ( $this->update_results['plugin'] as $upgrade ) {
+                $plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
+            }
+        }
+        wp_update_plugins( $plugin_stats ); // Check for plugin updates.
+
+        // Finally, process any new translations.
+        $language_updates = wp_get_translation_updates();
+        if ( $language_updates ) {
+            foreach ( $language_updates as $update ) {
+                $this->update( 'translation', $update );
+            }
+
+            // Clear existing caches.
+            wp_clean_update_cache();
+
+            wp_version_check();  // Check for core updates.
+            wp_update_themes();  // Check for theme updates.
+            wp_update_plugins(); // Check for plugin updates.
+        }
+
+        // Send debugging email to admin for all development installations.
+        if ( ! empty( $this->update_results ) ) {
+            $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
+
+            /**
+             * Filters whether to send a debugging email for each automatic background update.
+             *
+             * @since 3.7.0
+             *
+             * @param bool $development_version By default, emails are sent if the
+             *                                  install is a development version.
+             *                                  Return false to avoid the email.
+             */
+            if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) ) {
+                $this->send_debug_email();
+            }
+
+            if ( ! empty( $this->update_results['core'] ) ) {
+                $this->after_core_update( $this->update_results['core'][0] );
+            } elseif ( ! empty( $this->update_results['plugin'] ) || ! empty( $this->update_results['theme'] ) ) {
+                $this->after_plugin_theme_update( $this->update_results );
+            }
+
+            /**
+             * Fires after all automatic updates have run.
+             *
+             * @since 3.8.0
+             *
+             * @param array $update_results The results of all attempted updates.
+             */
+            do_action( 'automatic_updates_complete', $this->update_results );
+        }
+
+        WP_Upgrader::release_lock( 'auto_updater' );
+    }
+
+    /**
+     * If we tried to perform a core update, check if we should send an email,
+     * and if we need to avoid processing future updates.
+     *
+     * @since 3.7.0
+     *
+     * @param object $update_result The result of the core update. Includes the update offer and result.
+     */
+    protected function after_core_update( $update_result ) {
+        $wp_version = get_bloginfo( 'version' );
+
+        $core_update = $update_result->item;
+        $result      = $update_result->result;
+
+        if ( ! is_wp_error( $result ) ) {
+            $this->send_email( 'success', $core_update );
+            return;
+        }
+
+        $error_code = $result->get_error_code();
+
+        // Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
+        // We should not try to perform a background update again until there is a successful one-click update performed by the user.
+        $critical = false;
+        if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
+            $critical = true;
+        } elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
+            // A rollback is only critical if it failed too.
+            $critical        = true;
+            $rollback_result = $result->get_error_data()->rollback;
+        } elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
+            $critical = true;
+        }
+
+        if ( $critical ) {
+            $critical_data = array(
+                'attempted'  => $core_update->current,
+                'current'    => $wp_version,
+                'error_code' => $error_code,
+                'error_data' => $result->get_error_data(),
+                'timestamp'  => time(),
+                'critical'   => true,
+            );
+            if ( isset( $rollback_result ) ) {
+                $critical_data['rollback_code'] = $rollback_result->get_error_code();
+                $critical_data['rollback_data'] = $rollback_result->get_error_data();
+            }
+            update_site_option( 'auto_core_update_failed', $critical_data );
+            $this->send_email( 'critical', $core_update, $result );
+            return;
+        }
+
+        /*
 		 * Any other WP_Error code (like download_failed or files_not_writable) occurs before
 		 * we tried to copy over core files. Thus, the failures are early and graceful.
 		 *
@@ -624,745 +624,745 @@ 
 		 * In fact, let's schedule a special update for an hour from now. (It's possible
 		 * the issue could actually be on WordPress.org's side.) If that one fails, then email.
 		 */
-		$send               = true;
-		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
-		if ( in_array( $error_code, $transient_failures, true ) && ! get_site_option( 'auto_core_update_failed' ) ) {
-			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
-			$send = false;
-		}
-
-		$notified = get_site_option( 'auto_core_update_notified' );
-
-		// Don't notify if we've already notified the same email address of the same version of the same notification type.
-		if ( $notified
-			&& 'fail' === $notified['type']
-			&& get_site_option( 'admin_email' ) === $notified['email']
-			&& $notified['version'] === $core_update->current
-		) {
-			$send = false;
-		}
-
-		update_site_option(
-			'auto_core_update_failed',
-			array(
-				'attempted'  => $core_update->current,
-				'current'    => $wp_version,
-				'error_code' => $error_code,
-				'error_data' => $result->get_error_data(),
-				'timestamp'  => time(),
-				'retry'      => in_array( $error_code, $transient_failures, true ),
-			)
-		);
-
-		if ( $send ) {
-			$this->send_email( 'fail', $core_update, $result );
-		}
-	}
-
-	/**
-	 * Sends an email upon the completion or failure of a background core update.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
-	 * @param object $core_update The update offer that was attempted.
-	 * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
-	 */
-	protected function send_email( $type, $core_update, $result = null ) {
-		update_site_option(
-			'auto_core_update_notified',
-			array(
-				'type'      => $type,
-				'email'     => get_site_option( 'admin_email' ),
-				'version'   => $core_update->current,
-				'timestamp' => time(),
-			)
-		);
-
-		$next_user_core_update = get_preferred_from_update_core();
-
-		// If the update transient is empty, use the update we just performed.
-		if ( ! $next_user_core_update ) {
-			$next_user_core_update = $core_update;
-		}
-
-		if ( 'upgrade' === $next_user_core_update->response
-			&& version_compare( $next_user_core_update->version, $core_update->version, '>' )
-		) {
-			$newer_version_available = true;
-		} else {
-			$newer_version_available = false;
-		}
-
-		/**
-		 * Filters whether to send an email following an automatic background core update.
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param bool   $send        Whether to send the email. Default true.
-		 * @param string $type        The type of email to send. Can be one of
-		 *                            'success', 'fail', 'critical'.
-		 * @param object $core_update The update offer that was attempted.
-		 * @param mixed  $result      The result for the core update. Can be WP_Error.
-		 */
-		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) ) {
-			return;
-		}
-
-		switch ( $type ) {
-			case 'success': // We updated.
-				/* translators: Site updated notification email subject. 1: Site title, 2: WordPress version. */
-				$subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
-				break;
-
-			case 'fail':   // We tried to update but couldn't.
-			case 'manual': // We can't update (and made no attempt).
-				/* translators: Update available notification email subject. 1: Site title, 2: WordPress version. */
-				$subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
-				break;
-
-			case 'critical': // We tried to update, started to copy files, then things went wrong.
-				/* translators: Site down notification email subject. 1: Site title. */
-				$subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
-				break;
-
-			default:
-				return;
-		}
-
-		// If the auto-update is not to the latest version, say that the current version of WP is available instead.
-		$version = 'success' === $type ? $core_update->current : $next_user_core_update->current;
-		$subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $version );
-
-		$body = '';
-
-		switch ( $type ) {
-			case 'success':
-				$body .= sprintf(
-					/* translators: 1: Home URL, 2: WordPress version. */
-					__( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ),
-					home_url(),
-					$core_update->current
-				);
-				$body .= "\n\n";
-				if ( ! $newer_version_available ) {
-					$body .= __( 'No further action is needed on your part.' ) . ' ';
-				}
-
-				// Can only reference the About screen if their update was successful.
-				list( $about_version ) = explode( '-', $core_update->current, 2 );
-				/* translators: %s: WordPress version. */
-				$body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
-				$body .= "\n" . admin_url( 'about.php' );
-
-				if ( $newer_version_available ) {
-					/* translators: %s: WordPress latest version. */
-					$body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
-					$body .= __( 'Updating is easy and only takes a few moments:' );
-					$body .= "\n" . network_admin_url( 'update-core.php' );
-				}
-
-				break;
-
-			case 'fail':
-			case 'manual':
-				$body .= sprintf(
-					/* translators: 1: Home URL, 2: WordPress version. */
-					__( 'Please update your site at %1$s to WordPress %2$s.' ),
-					home_url(),
-					$next_user_core_update->current
-				);
-
-				$body .= "\n\n";
-
-				// Don't show this message if there is a newer version available.
-				// Potential for confusion, and also not useful for them to know at this point.
-				if ( 'fail' === $type && ! $newer_version_available ) {
-					$body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
-				}
-
-				$body .= __( 'Updating is easy and only takes a few moments:' );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
-				break;
-
-			case 'critical':
-				if ( $newer_version_available ) {
-					$body .= sprintf(
-						/* translators: 1: Home URL, 2: WordPress version. */
-						__( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ),
-						home_url(),
-						$core_update->current
-					);
-				} else {
-					$body .= sprintf(
-						/* translators: 1: Home URL, 2: WordPress latest version. */
-						__( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ),
-						home_url(),
-						$core_update->current
-					);
-				}
-
-				$body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
-
-				$body .= "\n\n" . __( "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
-				break;
-		}
-
-		$critical_support = 'critical' === $type && ! empty( $core_update->support_email );
-		if ( $critical_support ) {
-			// Support offer if available.
-			$body .= "\n\n" . sprintf(
-				/* translators: %s: Support email address. */
-				__( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ),
-				$core_update->support_email
-			);
-		} else {
-			// Add a note about the support forums.
-			$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-			$body .= "\n" . __( 'https://wordpress.org/support/forums/' );
-		}
-
-		// Updates are important!
-		if ( 'success' !== $type || $newer_version_available ) {
-			$body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
-		}
-
-		if ( $critical_support ) {
-			$body .= ' ' . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
-		}
-
-		// If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
-		if ( 'success' === $type && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
-			$body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
-			$body .= "\n" . network_admin_url();
-		}
-
-		$body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
-
-		if ( 'critical' === $type && is_wp_error( $result ) ) {
-			$body .= "\n***\n\n";
-			/* translators: %s: WordPress version. */
-			$body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
-			$body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
-			$body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
-
-			// If we had a rollback and we're still critical, then the rollback failed too.
-			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-			if ( 'rollback_was_required' === $result->get_error_code() ) {
-				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
-			} else {
-				$errors = array( $result );
-			}
-
-			foreach ( $errors as $error ) {
-				if ( ! is_wp_error( $error ) ) {
-					continue;
-				}
-
-				$error_code = $error->get_error_code();
-				/* translators: %s: Error code. */
-				$body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
-
-				if ( 'rollback_was_required' === $error_code ) {
-					continue;
-				}
-
-				if ( $error->get_error_message() ) {
-					$body .= "\n" . $error->get_error_message();
-				}
-
-				$error_data = $error->get_error_data();
-				if ( $error_data ) {
-					$body .= "\n" . implode( ', ', (array) $error_data );
-				}
-			}
-
-			$body .= "\n";
-		}
-
-		$to      = get_site_option( 'admin_email' );
-		$headers = '';
-
-		$email = compact( 'to', 'subject', 'body', 'headers' );
-
-		/**
-		 * Filters the email sent following an automatic background core update.
-		 *
-		 * @since 3.7.0
-		 *
-		 * @param array $email {
-		 *     Array of email arguments that will be passed to wp_mail().
-		 *
-		 *     @type string $to      The email recipient. An array of emails
-		 *                            can be returned, as handled by wp_mail().
-		 *     @type string $subject The email's subject.
-		 *     @type string $body    The email message body.
-		 *     @type string $headers Any email headers, defaults to no headers.
-		 * }
-		 * @param string $type        The type of email being sent. Can be one of
-		 *                            'success', 'fail', 'manual', 'critical'.
-		 * @param object $core_update The update offer that was attempted.
-		 * @param mixed  $result      The result for the core update. Can be WP_Error.
-		 */
-		$email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
-
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
-	}
-
-
-	/**
-	 * If we tried to perform plugin or theme updates, check if we should send an email.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @param array $update_results The results of update tasks.
-	 */
-	protected function after_plugin_theme_update( $update_results ) {
-		$successful_updates = array();
-		$failed_updates     = array();
-
-		if ( ! empty( $update_results['plugin'] ) ) {
-			/**
-			 * Filters whether to send an email following an automatic background plugin update.
-			 *
-			 * @since 5.5.0
-			 * @since 5.5.1 Added the `$update_results` parameter.
-			 *
-			 * @param bool  $enabled        True if plugin update notifications are enabled, false otherwise.
-			 * @param array $update_results The results of plugins update tasks.
-			 */
-			$notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
-
-			if ( $notifications_enabled ) {
-				foreach ( $update_results['plugin'] as $update_result ) {
-					if ( true === $update_result->result ) {
-						$successful_updates['plugin'][] = $update_result;
-					} else {
-						$failed_updates['plugin'][] = $update_result;
-					}
-				}
-			}
-		}
-
-		if ( ! empty( $update_results['theme'] ) ) {
-			/**
-			 * Filters whether to send an email following an automatic background theme update.
-			 *
-			 * @since 5.5.0
-			 * @since 5.5.1 Added the `$update_results` parameter.
-			 *
-			 * @param bool  $enabled        True if theme update notifications are enabled, false otherwise.
-			 * @param array $update_results The results of theme update tasks.
-			 */
-			$notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
-
-			if ( $notifications_enabled ) {
-				foreach ( $update_results['theme'] as $update_result ) {
-					if ( true === $update_result->result ) {
-						$successful_updates['theme'][] = $update_result;
-					} else {
-						$failed_updates['theme'][] = $update_result;
-					}
-				}
-			}
-		}
-
-		if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
-			return;
-		}
-
-		if ( empty( $failed_updates ) ) {
-			$this->send_plugin_theme_email( 'success', $successful_updates, $failed_updates );
-		} elseif ( empty( $successful_updates ) ) {
-			$this->send_plugin_theme_email( 'fail', $successful_updates, $failed_updates );
-		} else {
-			$this->send_plugin_theme_email( 'mixed', $successful_updates, $failed_updates );
-		}
-	}
-
-	/**
-	 * Sends an email upon the completion or failure of a plugin or theme background update.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @param string $type               The type of email to send. Can be one of 'success', 'fail', 'mixed'.
-	 * @param array  $successful_updates A list of updates that succeeded.
-	 * @param array  $failed_updates     A list of updates that failed.
-	 */
-	protected function send_plugin_theme_email( $type, $successful_updates, $failed_updates ) {
-		// No updates were attempted.
-		if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
-			return;
-		}
-
-		$unique_failures     = false;
-		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
-
-		/*
+        $send               = true;
+        $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
+        if ( in_array( $error_code, $transient_failures, true ) && ! get_site_option( 'auto_core_update_failed' ) ) {
+            wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
+            $send = false;
+        }
+
+        $notified = get_site_option( 'auto_core_update_notified' );
+
+        // Don't notify if we've already notified the same email address of the same version of the same notification type.
+        if ( $notified
+            && 'fail' === $notified['type']
+            && get_site_option( 'admin_email' ) === $notified['email']
+            && $notified['version'] === $core_update->current
+        ) {
+            $send = false;
+        }
+
+        update_site_option(
+            'auto_core_update_failed',
+            array(
+                'attempted'  => $core_update->current,
+                'current'    => $wp_version,
+                'error_code' => $error_code,
+                'error_data' => $result->get_error_data(),
+                'timestamp'  => time(),
+                'retry'      => in_array( $error_code, $transient_failures, true ),
+            )
+        );
+
+        if ( $send ) {
+            $this->send_email( 'fail', $core_update, $result );
+        }
+    }
+
+    /**
+     * Sends an email upon the completion or failure of a background core update.
+     *
+     * @since 3.7.0
+     *
+     * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
+     * @param object $core_update The update offer that was attempted.
+     * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
+     */
+    protected function send_email( $type, $core_update, $result = null ) {
+        update_site_option(
+            'auto_core_update_notified',
+            array(
+                'type'      => $type,
+                'email'     => get_site_option( 'admin_email' ),
+                'version'   => $core_update->current,
+                'timestamp' => time(),
+            )
+        );
+
+        $next_user_core_update = get_preferred_from_update_core();
+
+        // If the update transient is empty, use the update we just performed.
+        if ( ! $next_user_core_update ) {
+            $next_user_core_update = $core_update;
+        }
+
+        if ( 'upgrade' === $next_user_core_update->response
+            && version_compare( $next_user_core_update->version, $core_update->version, '>' )
+        ) {
+            $newer_version_available = true;
+        } else {
+            $newer_version_available = false;
+        }
+
+        /**
+         * Filters whether to send an email following an automatic background core update.
+         *
+         * @since 3.7.0
+         *
+         * @param bool   $send        Whether to send the email. Default true.
+         * @param string $type        The type of email to send. Can be one of
+         *                            'success', 'fail', 'critical'.
+         * @param object $core_update The update offer that was attempted.
+         * @param mixed  $result      The result for the core update. Can be WP_Error.
+         */
+        if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) ) {
+            return;
+        }
+
+        switch ( $type ) {
+            case 'success': // We updated.
+                /* translators: Site updated notification email subject. 1: Site title, 2: WordPress version. */
+                $subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
+                break;
+
+            case 'fail':   // We tried to update but couldn't.
+            case 'manual': // We can't update (and made no attempt).
+                /* translators: Update available notification email subject. 1: Site title, 2: WordPress version. */
+                $subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
+                break;
+
+            case 'critical': // We tried to update, started to copy files, then things went wrong.
+                /* translators: Site down notification email subject. 1: Site title. */
+                $subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
+                break;
+
+            default:
+                return;
+        }
+
+        // If the auto-update is not to the latest version, say that the current version of WP is available instead.
+        $version = 'success' === $type ? $core_update->current : $next_user_core_update->current;
+        $subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $version );
+
+        $body = '';
+
+        switch ( $type ) {
+            case 'success':
+                $body .= sprintf(
+                    /* translators: 1: Home URL, 2: WordPress version. */
+                    __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ),
+                    home_url(),
+                    $core_update->current
+                );
+                $body .= "\n\n";
+                if ( ! $newer_version_available ) {
+                    $body .= __( 'No further action is needed on your part.' ) . ' ';
+                }
+
+                // Can only reference the About screen if their update was successful.
+                list( $about_version ) = explode( '-', $core_update->current, 2 );
+                /* translators: %s: WordPress version. */
+                $body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
+                $body .= "\n" . admin_url( 'about.php' );
+
+                if ( $newer_version_available ) {
+                    /* translators: %s: WordPress latest version. */
+                    $body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
+                    $body .= __( 'Updating is easy and only takes a few moments:' );
+                    $body .= "\n" . network_admin_url( 'update-core.php' );
+                }
+
+                break;
+
+            case 'fail':
+            case 'manual':
+                $body .= sprintf(
+                    /* translators: 1: Home URL, 2: WordPress version. */
+                    __( 'Please update your site at %1$s to WordPress %2$s.' ),
+                    home_url(),
+                    $next_user_core_update->current
+                );
+
+                $body .= "\n\n";
+
+                // Don't show this message if there is a newer version available.
+                // Potential for confusion, and also not useful for them to know at this point.
+                if ( 'fail' === $type && ! $newer_version_available ) {
+                    $body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
+                }
+
+                $body .= __( 'Updating is easy and only takes a few moments:' );
+                $body .= "\n" . network_admin_url( 'update-core.php' );
+                break;
+
+            case 'critical':
+                if ( $newer_version_available ) {
+                    $body .= sprintf(
+                        /* translators: 1: Home URL, 2: WordPress version. */
+                        __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ),
+                        home_url(),
+                        $core_update->current
+                    );
+                } else {
+                    $body .= sprintf(
+                        /* translators: 1: Home URL, 2: WordPress latest version. */
+                        __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ),
+                        home_url(),
+                        $core_update->current
+                    );
+                }
+
+                $body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
+
+                $body .= "\n\n" . __( "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" );
+                $body .= "\n" . network_admin_url( 'update-core.php' );
+                break;
+        }
+
+        $critical_support = 'critical' === $type && ! empty( $core_update->support_email );
+        if ( $critical_support ) {
+            // Support offer if available.
+            $body .= "\n\n" . sprintf(
+                /* translators: %s: Support email address. */
+                __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ),
+                $core_update->support_email
+            );
+        } else {
+            // Add a note about the support forums.
+            $body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
+            $body .= "\n" . __( 'https://wordpress.org/support/forums/' );
+        }
+
+        // Updates are important!
+        if ( 'success' !== $type || $newer_version_available ) {
+            $body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
+        }
+
+        if ( $critical_support ) {
+            $body .= ' ' . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
+        }
+
+        // If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
+        if ( 'success' === $type && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
+            $body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
+            $body .= "\n" . network_admin_url();
+        }
+
+        $body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
+
+        if ( 'critical' === $type && is_wp_error( $result ) ) {
+            $body .= "\n***\n\n";
+            /* translators: %s: WordPress version. */
+            $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
+            $body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
+            $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
+
+            // If we had a rollback and we're still critical, then the rollback failed too.
+            // Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
+            if ( 'rollback_was_required' === $result->get_error_code() ) {
+                $errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
+            } else {
+                $errors = array( $result );
+            }
+
+            foreach ( $errors as $error ) {
+                if ( ! is_wp_error( $error ) ) {
+                    continue;
+                }
+
+                $error_code = $error->get_error_code();
+                /* translators: %s: Error code. */
+                $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
+
+                if ( 'rollback_was_required' === $error_code ) {
+                    continue;
+                }
+
+                if ( $error->get_error_message() ) {
+                    $body .= "\n" . $error->get_error_message();
+                }
+
+                $error_data = $error->get_error_data();
+                if ( $error_data ) {
+                    $body .= "\n" . implode( ', ', (array) $error_data );
+                }
+            }
+
+            $body .= "\n";
+        }
+
+        $to      = get_site_option( 'admin_email' );
+        $headers = '';
+
+        $email = compact( 'to', 'subject', 'body', 'headers' );
+
+        /**
+         * Filters the email sent following an automatic background core update.
+         *
+         * @since 3.7.0
+         *
+         * @param array $email {
+         *     Array of email arguments that will be passed to wp_mail().
+         *
+         *     @type string $to      The email recipient. An array of emails
+         *                            can be returned, as handled by wp_mail().
+         *     @type string $subject The email's subject.
+         *     @type string $body    The email message body.
+         *     @type string $headers Any email headers, defaults to no headers.
+         * }
+         * @param string $type        The type of email being sent. Can be one of
+         *                            'success', 'fail', 'manual', 'critical'.
+         * @param object $core_update The update offer that was attempted.
+         * @param mixed  $result      The result for the core update. Can be WP_Error.
+         */
+        $email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
+
+        wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+    }
+
+
+    /**
+     * If we tried to perform plugin or theme updates, check if we should send an email.
+     *
+     * @since 5.5.0
+     *
+     * @param array $update_results The results of update tasks.
+     */
+    protected function after_plugin_theme_update( $update_results ) {
+        $successful_updates = array();
+        $failed_updates     = array();
+
+        if ( ! empty( $update_results['plugin'] ) ) {
+            /**
+             * Filters whether to send an email following an automatic background plugin update.
+             *
+             * @since 5.5.0
+             * @since 5.5.1 Added the `$update_results` parameter.
+             *
+             * @param bool  $enabled        True if plugin update notifications are enabled, false otherwise.
+             * @param array $update_results The results of plugins update tasks.
+             */
+            $notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
+
+            if ( $notifications_enabled ) {
+                foreach ( $update_results['plugin'] as $update_result ) {
+                    if ( true === $update_result->result ) {
+                        $successful_updates['plugin'][] = $update_result;
+                    } else {
+                        $failed_updates['plugin'][] = $update_result;
+                    }
+                }
+            }
+        }
+
+        if ( ! empty( $update_results['theme'] ) ) {
+            /**
+             * Filters whether to send an email following an automatic background theme update.
+             *
+             * @since 5.5.0
+             * @since 5.5.1 Added the `$update_results` parameter.
+             *
+             * @param bool  $enabled        True if theme update notifications are enabled, false otherwise.
+             * @param array $update_results The results of theme update tasks.
+             */
+            $notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
+
+            if ( $notifications_enabled ) {
+                foreach ( $update_results['theme'] as $update_result ) {
+                    if ( true === $update_result->result ) {
+                        $successful_updates['theme'][] = $update_result;
+                    } else {
+                        $failed_updates['theme'][] = $update_result;
+                    }
+                }
+            }
+        }
+
+        if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
+            return;
+        }
+
+        if ( empty( $failed_updates ) ) {
+            $this->send_plugin_theme_email( 'success', $successful_updates, $failed_updates );
+        } elseif ( empty( $successful_updates ) ) {
+            $this->send_plugin_theme_email( 'fail', $successful_updates, $failed_updates );
+        } else {
+            $this->send_plugin_theme_email( 'mixed', $successful_updates, $failed_updates );
+        }
+    }
+
+    /**
+     * Sends an email upon the completion or failure of a plugin or theme background update.
+     *
+     * @since 5.5.0
+     *
+     * @param string $type               The type of email to send. Can be one of 'success', 'fail', 'mixed'.
+     * @param array  $successful_updates A list of updates that succeeded.
+     * @param array  $failed_updates     A list of updates that failed.
+     */
+    protected function send_plugin_theme_email( $type, $successful_updates, $failed_updates ) {
+        // No updates were attempted.
+        if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
+            return;
+        }
+
+        $unique_failures     = false;
+        $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
+
+        /*
 		 * When only failures have occurred, an email should only be sent if there are unique failures.
 		 * A failure is considered unique if an email has not been sent for an update attempt failure
 		 * to a plugin or theme with the same new_version.
 		 */
-		if ( 'fail' === $type ) {
-			foreach ( $failed_updates as $update_type => $failures ) {
-				foreach ( $failures as $failed_update ) {
-					if ( ! isset( $past_failure_emails[ $failed_update->item->{$update_type} ] ) ) {
-						$unique_failures = true;
-						continue;
-					}
-
-					// Check that the failure represents a new failure based on the new_version.
-					if ( version_compare( $past_failure_emails[ $failed_update->item->{$update_type} ], $failed_update->item->new_version, '<' ) ) {
-						$unique_failures = true;
-					}
-				}
-			}
-
-			if ( ! $unique_failures ) {
-				return;
-			}
-		}
-
-		$body               = array();
-		$successful_plugins = ( ! empty( $successful_updates['plugin'] ) );
-		$successful_themes  = ( ! empty( $successful_updates['theme'] ) );
-		$failed_plugins     = ( ! empty( $failed_updates['plugin'] ) );
-		$failed_themes      = ( ! empty( $failed_updates['theme'] ) );
-
-		switch ( $type ) {
-			case 'success':
-				if ( $successful_plugins && $successful_themes ) {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins and themes have automatically updated' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Some plugins and themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
-						home_url()
-					);
-				} elseif ( $successful_plugins ) {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins were automatically updated' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Some plugins have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
-						home_url()
-					);
-				} else {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some themes were automatically updated' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Some themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
-						home_url()
-					);
-				}
-
-				break;
-			case 'fail':
-			case 'mixed':
-				if ( $failed_plugins && $failed_themes ) {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins and themes have failed to update' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Plugins and themes failed to update on your site at %s.' ),
-						home_url()
-					);
-				} elseif ( $failed_plugins ) {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins have failed to update' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Plugins failed to update on your site at %s.' ),
-						home_url()
-					);
-				} else {
-					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some themes have failed to update' );
-					$body[]  = sprintf(
-						/* translators: %s: Home URL. */
-						__( 'Howdy! Themes failed to update on your site at %s.' ),
-						home_url()
-					);
-				}
-
-				break;
-		}
-
-		if ( in_array( $type, array( 'fail', 'mixed' ), true ) ) {
-			$body[] = "\n";
-			$body[] = __( 'Please check your site now. It’s possible that everything is working. If there are updates available, you should update.' );
-			$body[] = "\n";
-
-			// List failed plugin updates.
-			if ( ! empty( $failed_updates['plugin'] ) ) {
-				$body[] = __( 'These plugins failed to update:' );
-
-				foreach ( $failed_updates['plugin'] as $item ) {
-					if ( $item->item->current_version ) {
-						$body[] = sprintf(
-							/* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
-							$item->item->current_version,
-							$item->item->new_version
-						);
-					} else {
-						$body[] = sprintf(
-							/* translators: 1: Plugin name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
-							$item->name,
-							$item->item->new_version
-						);
-					}
-
-					$past_failure_emails[ $item->item->plugin ] = $item->item->new_version;
-				}
-
-				$body[] = "\n";
-			}
-
-			// List failed theme updates.
-			if ( ! empty( $failed_updates['theme'] ) ) {
-				$body[] = __( 'These themes failed to update:' );
-
-				foreach ( $failed_updates['theme'] as $item ) {
-					if ( $item->item->current_version ) {
-						$body[] = sprintf(
-							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
-							$item->item->current_version,
-							$item->item->new_version
-						);
-					} else {
-						$body[] = sprintf(
-							/* translators: 1: Theme name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
-							$item->name,
-							$item->item->new_version
-						);
-					}
-
-					$past_failure_emails[ $item->item->theme ] = $item->item->new_version;
-				}
-
-				$body[] = "\n";
-			}
-		}
-
-		// List successful updates.
-		if ( in_array( $type, array( 'success', 'mixed' ), true ) ) {
-			$body[] = "\n";
-
-			// List successful plugin updates.
-			if ( ! empty( $successful_updates['plugin'] ) ) {
-				$body[] = __( 'These plugins are now up to date:' );
-
-				foreach ( $successful_updates['plugin'] as $item ) {
-					if ( $item->item->current_version ) {
-						$body[] = sprintf(
-							/* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
-							$item->item->current_version,
-							$item->item->new_version
-						);
-					} else {
-						$body[] = sprintf(
-							/* translators: 1: Plugin name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
-							$item->name,
-							$item->item->new_version
-						);
-					}
-
-					unset( $past_failure_emails[ $item->item->plugin ] );
-				}
-
-				$body[] = "\n";
-			}
-
-			// List successful theme updates.
-			if ( ! empty( $successful_updates['theme'] ) ) {
-				$body[] = __( 'These themes are now up to date:' );
-
-				foreach ( $successful_updates['theme'] as $item ) {
-					if ( $item->item->current_version ) {
-						$body[] = sprintf(
-							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
-							$item->item->current_version,
-							$item->item->new_version
-						);
-					} else {
-						$body[] = sprintf(
-							/* translators: 1: Theme name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
-							$item->name,
-							$item->item->new_version
-						);
-					}
-
-					unset( $past_failure_emails[ $item->item->theme ] );
-				}
-
-				$body[] = "\n";
-			}
-		}
-
-		if ( $failed_plugins ) {
-			$body[] = sprintf(
-				/* translators: %s: Plugins screen URL. */
-				__( 'To manage plugins on your site, visit the Plugins page: %s' ),
-				admin_url( 'plugins.php' )
-			);
-			$body[] = "\n";
-		}
-
-		if ( $failed_themes ) {
-			$body[] = sprintf(
-				/* translators: %s: Themes screen URL. */
-				__( 'To manage themes on your site, visit the Themes page: %s' ),
-				admin_url( 'themes.php' )
-			);
-			$body[] = "\n";
-		}
-
-		// Add a note about the support forums.
-		$body[] = __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-		$body[] = __( 'https://wordpress.org/support/forums/' );
-		$body[] = "\n" . __( 'The WordPress Team' );
-
-		if ( '' !== get_option( 'blogname' ) ) {
-			$site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-		} else {
-			$site_title = parse_url( home_url(), PHP_URL_HOST );
-		}
-
-		$body    = implode( "\n", $body );
-		$to      = get_site_option( 'admin_email' );
-		$subject = sprintf( $subject, $site_title );
-		$headers = '';
-
-		$email = compact( 'to', 'subject', 'body', 'headers' );
-
-		/**
-		 * Filters the email sent following an automatic background update for plugins and themes.
-		 *
-		 * @since 5.5.0
-		 *
-		 * @param array  $email {
-		 *     Array of email arguments that will be passed to wp_mail().
-		 *
-		 *     @type string $to      The email recipient. An array of emails
-		 *                           can be returned, as handled by wp_mail().
-		 *     @type string $subject The email's subject.
-		 *     @type string $body    The email message body.
-		 *     @type string $headers Any email headers, defaults to no headers.
-		 * }
-		 * @param string $type               The type of email being sent. Can be one of 'success', 'fail', 'mixed'.
-		 * @param array  $successful_updates A list of updates that succeeded.
-		 * @param array  $failed_updates     A list of updates that failed.
-		 */
-		$email = apply_filters( 'auto_plugin_theme_update_email', $email, $type, $successful_updates, $failed_updates );
-
-		$result = wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
-
-		if ( $result ) {
-			update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
-		}
-	}
-
-	/**
-	 * Prepares and sends an email of a full log of background update results, useful for debugging and geekery.
-	 *
-	 * @since 3.7.0
-	 */
-	protected function send_debug_email() {
-		$update_count = 0;
-		foreach ( $this->update_results as $type => $updates ) {
-			$update_count += count( $updates );
-		}
-
-		$body     = array();
-		$failures = 0;
-
-		/* translators: %s: Network home URL. */
-		$body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
-
-		// Core.
-		if ( isset( $this->update_results['core'] ) ) {
-			$result = $this->update_results['core'][0];
-
-			if ( $result->result && ! is_wp_error( $result->result ) ) {
-				/* translators: %s: WordPress version. */
-				$body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
-			} else {
-				/* translators: %s: WordPress version. */
-				$body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
-				$failures++;
-			}
-
-			$body[] = '';
-		}
-
-		// Plugins, Themes, Translations.
-		foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) ) {
-				continue;
-			}
-
-			$success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
-
-			if ( $success_items ) {
-				$messages = array(
-					'plugin'      => __( 'The following plugins were successfully updated:' ),
-					'theme'       => __( 'The following themes were successfully updated:' ),
-					'translation' => __( 'The following translations were successfully updated:' ),
-				);
-
-				$body[] = $messages[ $type ];
-				foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
-					/* translators: %s: Name of plugin / theme / translation. */
-					$body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
-				}
-			}
-
-			if ( $success_items !== $this->update_results[ $type ] ) {
-				// Failed updates.
-				$messages = array(
-					'plugin'      => __( 'The following plugins failed to update:' ),
-					'theme'       => __( 'The following themes failed to update:' ),
-					'translation' => __( 'The following translations failed to update:' ),
-				);
-
-				$body[] = $messages[ $type ];
-
-				foreach ( $this->update_results[ $type ] as $item ) {
-					if ( ! $item->result || is_wp_error( $item->result ) ) {
-						/* translators: %s: Name of plugin / theme / translation. */
-						$body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
-						$failures++;
-					}
-				}
-			}
-
-			$body[] = '';
-		}
-
-		if ( '' !== get_bloginfo( 'name' ) ) {
-			$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
-		} else {
-			$site_title = parse_url( home_url(), PHP_URL_HOST );
-		}
-
-		if ( $failures ) {
-			$body[] = trim(
-				__(
-					"BETA TESTING?
+        if ( 'fail' === $type ) {
+            foreach ( $failed_updates as $update_type => $failures ) {
+                foreach ( $failures as $failed_update ) {
+                    if ( ! isset( $past_failure_emails[ $failed_update->item->{$update_type} ] ) ) {
+                        $unique_failures = true;
+                        continue;
+                    }
+
+                    // Check that the failure represents a new failure based on the new_version.
+                    if ( version_compare( $past_failure_emails[ $failed_update->item->{$update_type} ], $failed_update->item->new_version, '<' ) ) {
+                        $unique_failures = true;
+                    }
+                }
+            }
+
+            if ( ! $unique_failures ) {
+                return;
+            }
+        }
+
+        $body               = array();
+        $successful_plugins = ( ! empty( $successful_updates['plugin'] ) );
+        $successful_themes  = ( ! empty( $successful_updates['theme'] ) );
+        $failed_plugins     = ( ! empty( $failed_updates['plugin'] ) );
+        $failed_themes      = ( ! empty( $failed_updates['theme'] ) );
+
+        switch ( $type ) {
+            case 'success':
+                if ( $successful_plugins && $successful_themes ) {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some plugins and themes have automatically updated' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Some plugins and themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+                        home_url()
+                    );
+                } elseif ( $successful_plugins ) {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some plugins were automatically updated' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Some plugins have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+                        home_url()
+                    );
+                } else {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some themes were automatically updated' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Some themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+                        home_url()
+                    );
+                }
+
+                break;
+            case 'fail':
+            case 'mixed':
+                if ( $failed_plugins && $failed_themes ) {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some plugins and themes have failed to update' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Plugins and themes failed to update on your site at %s.' ),
+                        home_url()
+                    );
+                } elseif ( $failed_plugins ) {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some plugins have failed to update' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Plugins failed to update on your site at %s.' ),
+                        home_url()
+                    );
+                } else {
+                    /* translators: %s: Site title. */
+                    $subject = __( '[%s] Some themes have failed to update' );
+                    $body[]  = sprintf(
+                        /* translators: %s: Home URL. */
+                        __( 'Howdy! Themes failed to update on your site at %s.' ),
+                        home_url()
+                    );
+                }
+
+                break;
+        }
+
+        if ( in_array( $type, array( 'fail', 'mixed' ), true ) ) {
+            $body[] = "\n";
+            $body[] = __( 'Please check your site now. It’s possible that everything is working. If there are updates available, you should update.' );
+            $body[] = "\n";
+
+            // List failed plugin updates.
+            if ( ! empty( $failed_updates['plugin'] ) ) {
+                $body[] = __( 'These plugins failed to update:' );
+
+                foreach ( $failed_updates['plugin'] as $item ) {
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
+                            __( '- %1$s (from version %2$s to %3$s)' ),
+                            $item->name,
+                            $item->item->current_version,
+                            $item->item->new_version
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
+
+                    $past_failure_emails[ $item->item->plugin ] = $item->item->new_version;
+                }
+
+                $body[] = "\n";
+            }
+
+            // List failed theme updates.
+            if ( ! empty( $failed_updates['theme'] ) ) {
+                $body[] = __( 'These themes failed to update:' );
+
+                foreach ( $failed_updates['theme'] as $item ) {
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* translators: 1: Theme name, 2: Current version number, 3: New version number. */
+                            __( '- %1$s (from version %2$s to %3$s)' ),
+                            $item->name,
+                            $item->item->current_version,
+                            $item->item->new_version
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Theme name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
+
+                    $past_failure_emails[ $item->item->theme ] = $item->item->new_version;
+                }
+
+                $body[] = "\n";
+            }
+        }
+
+        // List successful updates.
+        if ( in_array( $type, array( 'success', 'mixed' ), true ) ) {
+            $body[] = "\n";
+
+            // List successful plugin updates.
+            if ( ! empty( $successful_updates['plugin'] ) ) {
+                $body[] = __( 'These plugins are now up to date:' );
+
+                foreach ( $successful_updates['plugin'] as $item ) {
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
+                            __( '- %1$s (from version %2$s to %3$s)' ),
+                            $item->name,
+                            $item->item->current_version,
+                            $item->item->new_version
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Plugin name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
+
+                    unset( $past_failure_emails[ $item->item->plugin ] );
+                }
+
+                $body[] = "\n";
+            }
+
+            // List successful theme updates.
+            if ( ! empty( $successful_updates['theme'] ) ) {
+                $body[] = __( 'These themes are now up to date:' );
+
+                foreach ( $successful_updates['theme'] as $item ) {
+                    if ( $item->item->current_version ) {
+                        $body[] = sprintf(
+                            /* translators: 1: Theme name, 2: Current version number, 3: New version number. */
+                            __( '- %1$s (from version %2$s to %3$s)' ),
+                            $item->name,
+                            $item->item->current_version,
+                            $item->item->new_version
+                        );
+                    } else {
+                        $body[] = sprintf(
+                            /* translators: 1: Theme name, 2: Version number. */
+                            __( '- %1$s version %2$s' ),
+                            $item->name,
+                            $item->item->new_version
+                        );
+                    }
+
+                    unset( $past_failure_emails[ $item->item->theme ] );
+                }
+
+                $body[] = "\n";
+            }
+        }
+
+        if ( $failed_plugins ) {
+            $body[] = sprintf(
+                /* translators: %s: Plugins screen URL. */
+                __( 'To manage plugins on your site, visit the Plugins page: %s' ),
+                admin_url( 'plugins.php' )
+            );
+            $body[] = "\n";
+        }
+
+        if ( $failed_themes ) {
+            $body[] = sprintf(
+                /* translators: %s: Themes screen URL. */
+                __( 'To manage themes on your site, visit the Themes page: %s' ),
+                admin_url( 'themes.php' )
+            );
+            $body[] = "\n";
+        }
+
+        // Add a note about the support forums.
+        $body[] = __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
+        $body[] = __( 'https://wordpress.org/support/forums/' );
+        $body[] = "\n" . __( 'The WordPress Team' );
+
+        if ( '' !== get_option( 'blogname' ) ) {
+            $site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+        } else {
+            $site_title = parse_url( home_url(), PHP_URL_HOST );
+        }
+
+        $body    = implode( "\n", $body );
+        $to      = get_site_option( 'admin_email' );
+        $subject = sprintf( $subject, $site_title );
+        $headers = '';
+
+        $email = compact( 'to', 'subject', 'body', 'headers' );
+
+        /**
+         * Filters the email sent following an automatic background update for plugins and themes.
+         *
+         * @since 5.5.0
+         *
+         * @param array  $email {
+         *     Array of email arguments that will be passed to wp_mail().
+         *
+         *     @type string $to      The email recipient. An array of emails
+         *                           can be returned, as handled by wp_mail().
+         *     @type string $subject The email's subject.
+         *     @type string $body    The email message body.
+         *     @type string $headers Any email headers, defaults to no headers.
+         * }
+         * @param string $type               The type of email being sent. Can be one of 'success', 'fail', 'mixed'.
+         * @param array  $successful_updates A list of updates that succeeded.
+         * @param array  $failed_updates     A list of updates that failed.
+         */
+        $email = apply_filters( 'auto_plugin_theme_update_email', $email, $type, $successful_updates, $failed_updates );
+
+        $result = wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+
+        if ( $result ) {
+            update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+        }
+    }
+
+    /**
+     * Prepares and sends an email of a full log of background update results, useful for debugging and geekery.
+     *
+     * @since 3.7.0
+     */
+    protected function send_debug_email() {
+        $update_count = 0;
+        foreach ( $this->update_results as $type => $updates ) {
+            $update_count += count( $updates );
+        }
+
+        $body     = array();
+        $failures = 0;
+
+        /* translators: %s: Network home URL. */
+        $body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
+
+        // Core.
+        if ( isset( $this->update_results['core'] ) ) {
+            $result = $this->update_results['core'][0];
+
+            if ( $result->result && ! is_wp_error( $result->result ) ) {
+                /* translators: %s: WordPress version. */
+                $body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
+            } else {
+                /* translators: %s: WordPress version. */
+                $body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
+                $failures++;
+            }
+
+            $body[] = '';
+        }
+
+        // Plugins, Themes, Translations.
+        foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
+            if ( ! isset( $this->update_results[ $type ] ) ) {
+                continue;
+            }
+
+            $success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
+
+            if ( $success_items ) {
+                $messages = array(
+                    'plugin'      => __( 'The following plugins were successfully updated:' ),
+                    'theme'       => __( 'The following themes were successfully updated:' ),
+                    'translation' => __( 'The following translations were successfully updated:' ),
+                );
+
+                $body[] = $messages[ $type ];
+                foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
+                    /* translators: %s: Name of plugin / theme / translation. */
+                    $body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
+                }
+            }
+
+            if ( $success_items !== $this->update_results[ $type ] ) {
+                // Failed updates.
+                $messages = array(
+                    'plugin'      => __( 'The following plugins failed to update:' ),
+                    'theme'       => __( 'The following themes failed to update:' ),
+                    'translation' => __( 'The following translations failed to update:' ),
+                );
+
+                $body[] = $messages[ $type ];
+
+                foreach ( $this->update_results[ $type ] as $item ) {
+                    if ( ! $item->result || is_wp_error( $item->result ) ) {
+                        /* translators: %s: Name of plugin / theme / translation. */
+                        $body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
+                        $failures++;
+                    }
+                }
+            }
+
+            $body[] = '';
+        }
+
+        if ( '' !== get_bloginfo( 'name' ) ) {
+            $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+        } else {
+            $site_title = parse_url( home_url(), PHP_URL_HOST );
+        }
+
+        if ( $failures ) {
+            $body[] = trim(
+                __(
+                    "BETA TESTING?
 =============
 
 This debugging email is sent when you are using a development version of WordPress.
@@ -1372,96 +1372,96 @@ 
  * Or, if you're comfortable writing a bug report: https://core.trac.wordpress.org/
 
 Thanks! -- The WordPress Team"
-				)
-			);
-			$body[] = '';
-
-			/* translators: Background update failed notification email subject. %s: Site title. */
-			$subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
-		} else {
-			/* translators: Background update finished notification email subject. %s: Site title. */
-			$subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
-		}
-
-		$body[] = trim(
-			__(
-				'UPDATE LOG
+                )
+            );
+            $body[] = '';
+
+            /* translators: Background update failed notification email subject. %s: Site title. */
+            $subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
+        } else {
+            /* translators: Background update finished notification email subject. %s: Site title. */
+            $subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
+        }
+
+        $body[] = trim(
+            __(
+                'UPDATE LOG
 =========='
-			)
-		);
-		$body[] = '';
-
-		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) ) {
-				continue;
-			}
-
-			foreach ( $this->update_results[ $type ] as $update ) {
-				$body[] = $update->name;
-				$body[] = str_repeat( '-', strlen( $update->name ) );
-
-				foreach ( $update->messages as $message ) {
-					$body[] = '  ' . html_entity_decode( str_replace( '&#8230;', '...', $message ) );
-				}
-
-				if ( is_wp_error( $update->result ) ) {
-					$results = array( 'update' => $update->result );
-
-					// If we rolled back, we want to know an error that occurred then too.
-					if ( 'rollback_was_required' === $update->result->get_error_code() ) {
-						$results = (array) $update->result->get_error_data();
-					}
-
-					foreach ( $results as $result_type => $result ) {
-						if ( ! is_wp_error( $result ) ) {
-							continue;
-						}
-
-						if ( 'rollback' === $result_type ) {
-							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Rollback Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
-						} else {
-							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
-						}
-
-						if ( $result->get_error_data() ) {
-							$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
-						}
-					}
-				}
-
-				$body[] = '';
-			}
-		}
-
-		$email = array(
-			'to'      => get_site_option( 'admin_email' ),
-			'subject' => $subject,
-			'body'    => implode( "\n", $body ),
-			'headers' => '',
-		);
-
-		/**
-		 * Filters the debug email that can be sent following an automatic
-		 * background core update.
-		 *
-		 * @since 3.8.0
-		 *
-		 * @param array $email {
-		 *     Array of email arguments that will be passed to wp_mail().
-		 *
-		 *     @type string $to      The email recipient. An array of emails
-		 *                           can be returned, as handled by wp_mail().
-		 *     @type string $subject Email subject.
-		 *     @type string $body    Email message body.
-		 *     @type string $headers Any email headers. Default empty.
-		 * }
-		 * @param int   $failures The number of failures encountered while upgrading.
-		 * @param mixed $results  The results of all attempted updates.
-		 */
-		$email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
-
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
-	}
+            )
+        );
+        $body[] = '';
+
+        foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
+            if ( ! isset( $this->update_results[ $type ] ) ) {
+                continue;
+            }
+
+            foreach ( $this->update_results[ $type ] as $update ) {
+                $body[] = $update->name;
+                $body[] = str_repeat( '-', strlen( $update->name ) );
+
+                foreach ( $update->messages as $message ) {
+                    $body[] = '  ' . html_entity_decode( str_replace( '&#8230;', '...', $message ) );
+                }
+
+                if ( is_wp_error( $update->result ) ) {
+                    $results = array( 'update' => $update->result );
+
+                    // If we rolled back, we want to know an error that occurred then too.
+                    if ( 'rollback_was_required' === $update->result->get_error_code() ) {
+                        $results = (array) $update->result->get_error_data();
+                    }
+
+                    foreach ( $results as $result_type => $result ) {
+                        if ( ! is_wp_error( $result ) ) {
+                            continue;
+                        }
+
+                        if ( 'rollback' === $result_type ) {
+                            /* translators: 1: Error code, 2: Error message. */
+                            $body[] = '  ' . sprintf( __( 'Rollback Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+                        } else {
+                            /* translators: 1: Error code, 2: Error message. */
+                            $body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+                        }
+
+                        if ( $result->get_error_data() ) {
+                            $body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+                        }
+                    }
+                }
+
+                $body[] = '';
+            }
+        }
+
+        $email = array(
+            'to'      => get_site_option( 'admin_email' ),
+            'subject' => $subject,
+            'body'    => implode( "\n", $body ),
+            'headers' => '',
+        );
+
+        /**
+         * Filters the debug email that can be sent following an automatic
+         * background core update.
+         *
+         * @since 3.8.0
+         *
+         * @param array $email {
+         *     Array of email arguments that will be passed to wp_mail().
+         *
+         *     @type string $to      The email recipient. An array of emails
+         *                           can be returned, as handled by wp_mail().
+         *     @type string $subject Email subject.
+         *     @type string $body    Email message body.
+         *     @type string $headers Any email headers. Default empty.
+         * }
+         * @param int   $failures The number of failures encountered while upgrading.
+         * @param mixed $results  The results of all attempted updates.
+         */
+        $email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
+
+        wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+    }
 }

Spacing +360 added lines, -360 removed lines

@@ -29,16 +29,16 @@ 
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
-		if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) ) {
+		if (!wp_is_file_mod_allowed('automatic_updater')) {
 			return true;
 		}
 
-		if ( wp_installing() ) {
+		if (wp_installing()) {
 			return true;
 		}
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
-		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
+		$disabled = defined('AUTOMATIC_UPDATER_DISABLED') && AUTOMATIC_UPDATER_DISABLED;
 
 		/**
 		 * Filters whether to entirely disable background updates.
@@ -52,7 +52,7 @@ 
 		 *
 		 * @param bool $disabled Whether the updater should be disabled.
 		 */
-		return apply_filters( 'automatic_updater_disabled', $disabled );
+		return apply_filters('automatic_updater_disabled', $disabled);
 	}
 
 	/**
@@ -73,36 +73,36 @@ 
 	 * @return bool True if a VCS checkout was discovered at `$context` or ABSPATH,
 	 *              or anywhere higher. False otherwise.
 	 */
-	public function is_vcs_checkout( $context ) {
-		$context_dirs = array( untrailingslashit( $context ) );
-		if ( ABSPATH !== $context ) {
-			$context_dirs[] = untrailingslashit( ABSPATH );
+	public function is_vcs_checkout($context) {
+		$context_dirs = array(untrailingslashit($context));
+		if (ABSPATH !== $context) {
+			$context_dirs[] = untrailingslashit(ABSPATH);
 		}
 
-		$vcs_dirs   = array( '.svn', '.git', '.hg', '.bzr' );
+		$vcs_dirs   = array('.svn', '.git', '.hg', '.bzr');
 		$check_dirs = array();
 
-		foreach ( $context_dirs as $context_dir ) {
+		foreach ($context_dirs as $context_dir) {
 			// Walk up from $context_dir to the root.
 			do {
 				$check_dirs[] = $context_dir;
 
 				// Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
-				if ( dirname( $context_dir ) === $context_dir ) {
+				if (dirname($context_dir) === $context_dir) {
 					break;
 				}
 
 				// Continue one level at a time.
-			} while ( $context_dir = dirname( $context_dir ) );
+			} while ($context_dir = dirname($context_dir));
 		}
 
-		$check_dirs = array_unique( $check_dirs );
+		$check_dirs = array_unique($check_dirs);
 
 		// Search all directories we've found for evidence of version control.
-		foreach ( $vcs_dirs as $vcs_dir ) {
-			foreach ( $check_dirs as $check_dir ) {
-				$checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
-				if ( $checkout ) {
+		foreach ($vcs_dirs as $vcs_dir) {
+			foreach ($check_dirs as $check_dir) {
+				$checkout = @is_dir(rtrim($check_dir, '\\/') . "/$vcs_dir");
+				if ($checkout) {
 					break 2;
 				}
 			}
@@ -119,7 +119,7 @@ 
 		 * @param string $context The filesystem context (a path) against which
 		 *                        filesystem status should be checked.
 		 */
-		return apply_filters( 'automatic_updates_is_vcs_checkout', $checkout, $context );
+		return apply_filters('automatic_updates_is_vcs_checkout', $checkout, $context);
 	}
 
 	/**
@@ -136,47 +136,47 @@ 
 	 *                        access and status should be checked.
 	 * @return bool True if the item should be updated, false otherwise.
 	 */
-	public function should_update( $type, $item, $context ) {
+	public function should_update($type, $item, $context) {
 		// Used to see if WP_Filesystem is set up to allow unattended updates.
 		$skin = new Automatic_Upgrader_Skin;
 
-		if ( $this->is_disabled() ) {
+		if ($this->is_disabled()) {
 			return false;
 		}
 
 		// Only relax the filesystem checks when the update doesn't include new files.
 		$allow_relaxed_file_ownership = false;
-		if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
+		if ('core' === $type && isset($item->new_files) && !$item->new_files) {
 			$allow_relaxed_file_ownership = true;
 		}
 
 		// If we can't do an auto core update, we may still be able to email the user.
-		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership )
-			|| $this->is_vcs_checkout( $context )
+		if (!$skin->request_filesystem_credentials(false, $context, $allow_relaxed_file_ownership)
+			|| $this->is_vcs_checkout($context)
 		) {
-			if ( 'core' === $type ) {
-				$this->send_core_update_notification_email( $item );
+			if ('core' === $type) {
+				$this->send_core_update_notification_email($item);
 			}
 			return false;
 		}
 
 		// Next up, is this an item we can update?
-		if ( 'core' === $type ) {
-			$update = Core_Upgrader::should_update_to_version( $item->current );
-		} elseif ( 'plugin' === $type || 'theme' === $type ) {
-			$update = ! empty( $item->autoupdate );
+		if ('core' === $type) {
+			$update = Core_Upgrader::should_update_to_version($item->current);
+		} elseif ('plugin' === $type || 'theme' === $type) {
+			$update = !empty($item->autoupdate);
 
-			if ( ! $update && wp_is_auto_update_enabled_for_type( $type ) ) {
+			if (!$update && wp_is_auto_update_enabled_for_type($type)) {
 				// Check if the site admin has enabled auto-updates by default for the specific item.
-				$auto_updates = (array) get_site_option( "auto_update_{$type}s", array() );
-				$update       = in_array( $item->{$type}, $auto_updates, true );
+				$auto_updates = (array) get_site_option("auto_update_{$type}s", array());
+				$update       = in_array($item->{$type}, $auto_updates, true);
 			}
 		} else {
-			$update = ! empty( $item->autoupdate );
+			$update = !empty($item->autoupdate);
 		}
 
 		// If the `disable_autoupdate` flag is set, override any user-choice, but allow filters.
-		if ( ! empty( $item->disable_autoupdate ) ) {
+		if (!empty($item->disable_autoupdate)) {
 			$update = $item->disable_autoupdate;
 		}
 
@@ -209,34 +209,34 @@ 
 		 *                          to detect whether nothing has hooked into this filter.
 		 * @param object    $item   The update offer.
 		 */
-		$update = apply_filters( "auto_update_{$type}", $update, $item );
+		$update = apply_filters("auto_update_{$type}", $update, $item);
 
-		if ( ! $update ) {
-			if ( 'core' === $type ) {
-				$this->send_core_update_notification_email( $item );
+		if (!$update) {
+			if ('core' === $type) {
+				$this->send_core_update_notification_email($item);
 			}
 			return false;
 		}
 
 		// If it's a core update, are we actually compatible with its requirements?
-		if ( 'core' === $type ) {
+		if ('core' === $type) {
 			global $wpdb;
 
-			$php_compat = version_compare( phpversion(), $item->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+			$php_compat = version_compare(phpversion(), $item->php_version, '>=');
+			if (file_exists(WP_CONTENT_DIR . '/db.php') && empty($wpdb->is_mysql)) {
 				$mysql_compat = true;
 			} else {
-				$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+				$mysql_compat = version_compare($wpdb->db_version(), $item->mysql_version, '>=');
 			}
 
-			if ( ! $php_compat || ! $mysql_compat ) {
+			if (!$php_compat || !$mysql_compat) {
 				return false;
 			}
 		}
 
 		// If updating a plugin or theme, ensure the minimum PHP version requirements are satisfied.
-		if ( in_array( $type, array( 'plugin', 'theme' ), true ) ) {
-			if ( ! empty( $item->requires_php ) && version_compare( phpversion(), $item->requires_php, '<' ) ) {
+		if (in_array($type, array('plugin', 'theme'), true)) {
+			if (!empty($item->requires_php) && version_compare(phpversion(), $item->requires_php, '<')) {
 				return false;
 			}
 		}
@@ -253,19 +253,19 @@ 
 	 * @return bool True if the site administrator is notified of a core update,
 	 *              false otherwise.
 	 */
-	protected function send_core_update_notification_email( $item ) {
-		$notified = get_site_option( 'auto_core_update_notified' );
+	protected function send_core_update_notification_email($item) {
+		$notified = get_site_option('auto_core_update_notified');
 
 		// Don't notify if we've already notified the same email address of the same version.
-		if ( $notified
-			&& get_site_option( 'admin_email' ) === $notified['email']
+		if ($notified
+			&& get_site_option('admin_email') === $notified['email']
 			&& $notified['version'] === $item->current
 		) {
 			return false;
 		}
 
 		// See if we need to notify users of a core update.
-		$notify = ! empty( $item->notify_email );
+		$notify = !empty($item->notify_email);
 
 		/**
 		 * Filters whether to notify the site administrator of a new core update.
@@ -286,11 +286,11 @@ 
 		 * @param bool   $notify Whether the site administrator is notified.
 		 * @param object $item   The update offer.
 		 */
-		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) ) {
+		if (!apply_filters('send_core_update_notification_email', $notify, $item)) {
 			return false;
 		}
 
-		$this->send_email( 'manual', $item );
+		$this->send_email('manual', $item);
 		return true;
 	}
 
@@ -303,32 +303,32 @@ 
 	 * @param object $item The update offer.
 	 * @return null|WP_Error
 	 */
-	public function update( $type, $item ) {
+	public function update($type, $item) {
 		$skin = new Automatic_Upgrader_Skin;
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				// The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter.
-				add_filter( 'update_feedback', array( $skin, 'feedback' ) );
-				$upgrader = new Core_Upgrader( $skin );
+				add_filter('update_feedback', array($skin, 'feedback'));
+				$upgrader = new Core_Upgrader($skin);
 				$context  = ABSPATH;
 				break;
 			case 'plugin':
-				$upgrader = new Plugin_Upgrader( $skin );
+				$upgrader = new Plugin_Upgrader($skin);
 				$context  = WP_PLUGIN_DIR; // We don't support custom Plugin directories, or updates for WPMU_PLUGIN_DIR.
 				break;
 			case 'theme':
-				$upgrader = new Theme_Upgrader( $skin );
-				$context  = get_theme_root( $item->theme );
+				$upgrader = new Theme_Upgrader($skin);
+				$context  = get_theme_root($item->theme);
 				break;
 			case 'translation':
-				$upgrader = new Language_Pack_Upgrader( $skin );
+				$upgrader = new Language_Pack_Upgrader($skin);
 				$context  = WP_CONTENT_DIR; // WP_LANG_DIR;
 				break;
 		}
 
 		// Determine whether we can and should perform this update.
-		if ( ! $this->should_update( $type, $item, $context ) ) {
+		if (!$this->should_update($type, $item, $context)) {
 			return false;
 		}
 
@@ -342,51 +342,51 @@ 
 		 * @param string $context The filesystem context (a path) against which filesystem access and status
 		 *                        should be checked.
 		 */
-		do_action( 'pre_auto_update', $type, $item, $context );
+		do_action('pre_auto_update', $type, $item, $context);
 
 		$upgrader_item = $item;
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				/* translators: %s: WordPress version. */
-				$skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
+				$skin->feedback(__('Updating to WordPress %s'), $item->version);
 				/* translators: %s: WordPress version. */
-				$item_name = sprintf( __( 'WordPress %s' ), $item->version );
+				$item_name = sprintf(__('WordPress %s'), $item->version);
 				break;
 			case 'theme':
 				$upgrader_item = $item->theme;
-				$theme         = wp_get_theme( $upgrader_item );
-				$item_name     = $theme->Get( 'Name' );
+				$theme         = wp_get_theme($upgrader_item);
+				$item_name     = $theme->Get('Name');
 				// Add the current version so that it can be reported in the notification email.
-				$item->current_version = $theme->get( 'Version' );
-				if ( empty( $item->current_version ) ) {
+				$item->current_version = $theme->get('Version');
+				if (empty($item->current_version)) {
 					$item->current_version = false;
 				}
 				/* translators: %s: Theme name. */
-				$skin->feedback( __( 'Updating theme: %s' ), $item_name );
+				$skin->feedback(__('Updating theme: %s'), $item_name);
 				break;
 			case 'plugin':
 				$upgrader_item = $item->plugin;
-				$plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
+				$plugin_data   = get_plugin_data($context . '/' . $upgrader_item);
 				$item_name     = $plugin_data['Name'];
 				// Add the current version so that it can be reported in the notification email.
 				$item->current_version = $plugin_data['Version'];
-				if ( empty( $item->current_version ) ) {
+				if (empty($item->current_version)) {
 					$item->current_version = false;
 				}
 				/* translators: %s: Plugin name. */
-				$skin->feedback( __( 'Updating plugin: %s' ), $item_name );
+				$skin->feedback(__('Updating plugin: %s'), $item_name);
 				break;
 			case 'translation':
-				$language_item_name = $upgrader->get_name_for_update( $item );
+				$language_item_name = $upgrader->get_name_for_update($item);
 				/* translators: %s: Project name (plugin, theme, or WordPress). */
-				$item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
+				$item_name = sprintf(__('Translations for %s'), $language_item_name);
 				/* translators: 1: Project name (plugin, theme, or WordPress), 2: Language. */
-				$skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)&#8230;' ), $language_item_name, $item->language ) );
+				$skin->feedback(sprintf(__('Updating translations for %1$s (%2$s)&#8230;'), $language_item_name, $item->language));
 				break;
 		}
 
 		$allow_relaxed_file_ownership = false;
-		if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
+		if ('core' === $type && isset($item->new_files) && !$item->new_files) {
 			$allow_relaxed_file_ownership = true;
 		}
 
@@ -405,14 +405,14 @@ 
 		);
 
 		// If the filesystem is unavailable, false is returned.
-		if ( false === $upgrade_result ) {
-			$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+		if (false === $upgrade_result) {
+			$upgrade_result = new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 		}
 
-		if ( 'core' === $type ) {
-			if ( is_wp_error( $upgrade_result )
-				&& ( 'up_to_date' === $upgrade_result->get_error_code()
-					|| 'locked' === $upgrade_result->get_error_code() )
+		if ('core' === $type) {
+			if (is_wp_error($upgrade_result)
+				&& ('up_to_date' === $upgrade_result->get_error_code()
+					|| 'locked' === $upgrade_result->get_error_code())
 			) {
 				// These aren't actual errors, treat it as a skipped-update instead
 				// to avoid triggering the post-core update failure routines.
@@ -420,15 +420,15 @@ 
 			}
 
 			// Core doesn't output this, so let's append it, so we don't get confused.
-			if ( is_wp_error( $upgrade_result ) ) {
-				$upgrade_result->add( 'installation_failed', __( 'Installation failed.' ) );
-				$skin->error( $upgrade_result );
+			if (is_wp_error($upgrade_result)) {
+				$upgrade_result->add('installation_failed', __('Installation failed.'));
+				$skin->error($upgrade_result);
 			} else {
-				$skin->feedback( __( 'WordPress updated successfully.' ) );
+				$skin->feedback(__('WordPress updated successfully.'));
 			}
 		}
 
-		$this->update_results[ $type ][] = (object) array(
+		$this->update_results[$type][] = (object) array(
 			'item'     => $item,
 			'result'   => $upgrade_result,
 			'name'     => $item_name,
@@ -444,41 +444,41 @@ 
 	 * @since 3.7.0
 	 */
 	public function run() {
-		if ( $this->is_disabled() ) {
+		if ($this->is_disabled()) {
 			return;
 		}
 
-		if ( ! is_main_network() || ! is_main_site() ) {
+		if (!is_main_network() || !is_main_site()) {
 			return;
 		}
 
-		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) ) {
+		if (!WP_Upgrader::create_lock('auto_updater')) {
 			return;
 		}
 
 		// Don't automatically run these things, as we'll handle it ourselves.
-		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-		remove_action( 'upgrader_process_complete', 'wp_version_check' );
-		remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
-		remove_action( 'upgrader_process_complete', 'wp_update_themes' );
+		remove_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+		remove_action('upgrader_process_complete', 'wp_version_check');
+		remove_action('upgrader_process_complete', 'wp_update_plugins');
+		remove_action('upgrader_process_complete', 'wp_update_themes');
 
 		// Next, plugins.
 		wp_update_plugins(); // Check for plugin updates.
-		$plugin_updates = get_site_transient( 'update_plugins' );
-		if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
-			foreach ( $plugin_updates->response as $plugin ) {
-				$this->update( 'plugin', $plugin );
+		$plugin_updates = get_site_transient('update_plugins');
+		if ($plugin_updates && !empty($plugin_updates->response)) {
+			foreach ($plugin_updates->response as $plugin) {
+				$this->update('plugin', $plugin);
 			}
 			// Force refresh of plugin update information.
 			wp_clean_plugins_cache();
 		}
 
 		// Next, those themes we all love.
-		wp_update_themes();  // Check for theme updates.
-		$theme_updates = get_site_transient( 'update_themes' );
-		if ( $theme_updates && ! empty( $theme_updates->response ) ) {
-			foreach ( $theme_updates->response as $theme ) {
-				$this->update( 'theme', (object) $theme );
+		wp_update_themes(); // Check for theme updates.
+		$theme_updates = get_site_transient('update_themes');
+		if ($theme_updates && !empty($theme_updates->response)) {
+			foreach ($theme_updates->response as $theme) {
+				$this->update('theme', (object) $theme);
 			}
 			// Force refresh of theme update information.
 			wp_clean_themes_cache();
@@ -488,46 +488,46 @@ 
 		wp_version_check(); // Check for core updates.
 		$core_update = find_core_auto_update();
 
-		if ( $core_update ) {
-			$this->update( 'core', $core_update );
+		if ($core_update) {
+			$this->update('core', $core_update);
 		}
 
 		// Clean up, and check for any pending translations.
 		// (Core_Upgrader checks for core updates.)
 		$theme_stats = array();
-		if ( isset( $this->update_results['theme'] ) ) {
-			foreach ( $this->update_results['theme'] as $upgrade ) {
-				$theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
+		if (isset($this->update_results['theme'])) {
+			foreach ($this->update_results['theme'] as $upgrade) {
+				$theme_stats[$upgrade->item->theme] = (true === $upgrade->result);
 			}
 		}
-		wp_update_themes( $theme_stats ); // Check for theme updates.
+		wp_update_themes($theme_stats); // Check for theme updates.
 
 		$plugin_stats = array();
-		if ( isset( $this->update_results['plugin'] ) ) {
-			foreach ( $this->update_results['plugin'] as $upgrade ) {
-				$plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
+		if (isset($this->update_results['plugin'])) {
+			foreach ($this->update_results['plugin'] as $upgrade) {
+				$plugin_stats[$upgrade->item->plugin] = (true === $upgrade->result);
 			}
 		}
-		wp_update_plugins( $plugin_stats ); // Check for plugin updates.
+		wp_update_plugins($plugin_stats); // Check for plugin updates.
 
 		// Finally, process any new translations.
 		$language_updates = wp_get_translation_updates();
-		if ( $language_updates ) {
-			foreach ( $language_updates as $update ) {
-				$this->update( 'translation', $update );
+		if ($language_updates) {
+			foreach ($language_updates as $update) {
+				$this->update('translation', $update);
 			}
 
 			// Clear existing caches.
 			wp_clean_update_cache();
 
-			wp_version_check();  // Check for core updates.
-			wp_update_themes();  // Check for theme updates.
+			wp_version_check(); // Check for core updates.
+			wp_update_themes(); // Check for theme updates.
 			wp_update_plugins(); // Check for plugin updates.
 		}
 
 		// Send debugging email to admin for all development installations.
-		if ( ! empty( $this->update_results ) ) {
-			$development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
+		if (!empty($this->update_results)) {
+			$development_version = false !== strpos(get_bloginfo('version'), '-');
 
 			/**
 			 * Filters whether to send a debugging email for each automatic background update.
@@ -538,14 +538,14 @@ 
 			 *                                  install is a development version.
 			 *                                  Return false to avoid the email.
 			 */
-			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) ) {
+			if (apply_filters('automatic_updates_send_debug_email', $development_version)) {
 				$this->send_debug_email();
 			}
 
-			if ( ! empty( $this->update_results['core'] ) ) {
-				$this->after_core_update( $this->update_results['core'][0] );
-			} elseif ( ! empty( $this->update_results['plugin'] ) || ! empty( $this->update_results['theme'] ) ) {
-				$this->after_plugin_theme_update( $this->update_results );
+			if (!empty($this->update_results['core'])) {
+				$this->after_core_update($this->update_results['core'][0]);
+			} elseif (!empty($this->update_results['plugin']) || !empty($this->update_results['theme'])) {
+				$this->after_plugin_theme_update($this->update_results);
 			}
 
 			/**
@@ -555,10 +555,10 @@ 
 			 *
 			 * @param array $update_results The results of all attempted updates.
 			 */
-			do_action( 'automatic_updates_complete', $this->update_results );
+			do_action('automatic_updates_complete', $this->update_results);
 		}
 
-		WP_Upgrader::release_lock( 'auto_updater' );
+		WP_Upgrader::release_lock('auto_updater');
 	}
 
 	/**
@@ -569,14 +569,14 @@ 
 	 *
 	 * @param object $update_result The result of the core update. Includes the update offer and result.
 	 */
-	protected function after_core_update( $update_result ) {
-		$wp_version = get_bloginfo( 'version' );
+	protected function after_core_update($update_result) {
+		$wp_version = get_bloginfo('version');
 
 		$core_update = $update_result->item;
 		$result      = $update_result->result;
 
-		if ( ! is_wp_error( $result ) ) {
-			$this->send_email( 'success', $core_update );
+		if (!is_wp_error($result)) {
+			$this->send_email('success', $core_update);
 			return;
 		}
 
@@ -585,17 +585,17 @@ 
 		// Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
 		// We should not try to perform a background update again until there is a successful one-click update performed by the user.
 		$critical = false;
-		if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
+		if ('disk_full' === $error_code || false !== strpos($error_code, '__copy_dir')) {
 			$critical = true;
-		} elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
+		} elseif ('rollback_was_required' === $error_code && is_wp_error($result->get_error_data()->rollback)) {
 			// A rollback is only critical if it failed too.
 			$critical        = true;
 			$rollback_result = $result->get_error_data()->rollback;
-		} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
+		} elseif (false !== strpos($error_code, 'do_rollback')) {
 			$critical = true;
 		}
 
-		if ( $critical ) {
+		if ($critical) {
 			$critical_data = array(
 				'attempted'  => $core_update->current,
 				'current'    => $wp_version,
@@ -604,12 +604,12 @@ 
 				'timestamp'  => time(),
 				'critical'   => true,
 			);
-			if ( isset( $rollback_result ) ) {
+			if (isset($rollback_result)) {
 				$critical_data['rollback_code'] = $rollback_result->get_error_code();
 				$critical_data['rollback_data'] = $rollback_result->get_error_data();
 			}
-			update_site_option( 'auto_core_update_failed', $critical_data );
-			$this->send_email( 'critical', $core_update, $result );
+			update_site_option('auto_core_update_failed', $critical_data);
+			$this->send_email('critical', $core_update, $result);
 			return;
 		}
 
@@ -625,18 +625,18 @@ 
 		 * the issue could actually be on WordPress.org's side.) If that one fails, then email.
 		 */
 		$send               = true;
-		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
-		if ( in_array( $error_code, $transient_failures, true ) && ! get_site_option( 'auto_core_update_failed' ) ) {
-			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
+		$transient_failures = array('incompatible_archive', 'download_failed', 'insane_distro', 'locked');
+		if (in_array($error_code, $transient_failures, true) && !get_site_option('auto_core_update_failed')) {
+			wp_schedule_single_event(time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update');
 			$send = false;
 		}
 
-		$notified = get_site_option( 'auto_core_update_notified' );
+		$notified = get_site_option('auto_core_update_notified');
 
 		// Don't notify if we've already notified the same email address of the same version of the same notification type.
-		if ( $notified
+		if ($notified
 			&& 'fail' === $notified['type']
-			&& get_site_option( 'admin_email' ) === $notified['email']
+			&& get_site_option('admin_email') === $notified['email']
 			&& $notified['version'] === $core_update->current
 		) {
 			$send = false;
@@ -650,12 +650,12 @@ 
 				'error_code' => $error_code,
 				'error_data' => $result->get_error_data(),
 				'timestamp'  => time(),
-				'retry'      => in_array( $error_code, $transient_failures, true ),
+				'retry'      => in_array($error_code, $transient_failures, true),
 			)
 		);
 
-		if ( $send ) {
-			$this->send_email( 'fail', $core_update, $result );
+		if ($send) {
+			$this->send_email('fail', $core_update, $result);
 		}
 	}
 
@@ -668,12 +668,12 @@ 
 	 * @param object $core_update The update offer that was attempted.
 	 * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
 	 */
-	protected function send_email( $type, $core_update, $result = null ) {
+	protected function send_email($type, $core_update, $result = null) {
 		update_site_option(
 			'auto_core_update_notified',
 			array(
 				'type'      => $type,
-				'email'     => get_site_option( 'admin_email' ),
+				'email'     => get_site_option('admin_email'),
 				'version'   => $core_update->current,
 				'timestamp' => time(),
 			)
@@ -682,12 +682,12 @@ 
 		$next_user_core_update = get_preferred_from_update_core();
 
 		// If the update transient is empty, use the update we just performed.
-		if ( ! $next_user_core_update ) {
+		if (!$next_user_core_update) {
 			$next_user_core_update = $core_update;
 		}
 
-		if ( 'upgrade' === $next_user_core_update->response
-			&& version_compare( $next_user_core_update->version, $core_update->version, '>' )
+		if ('upgrade' === $next_user_core_update->response
+			&& version_compare($next_user_core_update->version, $core_update->version, '>')
 		) {
 			$newer_version_available = true;
 		} else {
@@ -705,25 +705,25 @@ 
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) ) {
+		if ('manual' !== $type && !apply_filters('auto_core_update_send_email', true, $type, $core_update, $result)) {
 			return;
 		}
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success': // We updated.
 				/* translators: Site updated notification email subject. 1: Site title, 2: WordPress version. */
-				$subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
+				$subject = __('[%1$s] Your site has updated to WordPress %2$s');
 				break;
 
 			case 'fail':   // We tried to update but couldn't.
 			case 'manual': // We can't update (and made no attempt).
 				/* translators: Update available notification email subject. 1: Site title, 2: WordPress version. */
-				$subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
+				$subject = __('[%1$s] WordPress %2$s is available. Please update!');
 				break;
 
 			case 'critical': // We tried to update, started to copy files, then things went wrong.
 				/* translators: Site down notification email subject. 1: Site title. */
-				$subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
+				$subject = __('[%1$s] URGENT: Your site may be down due to a failed update');
 				break;
 
 			default:
@@ -732,34 +732,34 @@ 
 
 		// If the auto-update is not to the latest version, say that the current version of WP is available instead.
 		$version = 'success' === $type ? $core_update->current : $next_user_core_update->current;
-		$subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $version );
+		$subject = sprintf($subject, wp_specialchars_decode(get_option('blogname'), ENT_QUOTES), $version);
 
 		$body = '';
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success':
 				$body .= sprintf(
 					/* translators: 1: Home URL, 2: WordPress version. */
-					__( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ),
+					__('Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.'),
 					home_url(),
 					$core_update->current
 				);
 				$body .= "\n\n";
-				if ( ! $newer_version_available ) {
-					$body .= __( 'No further action is needed on your part.' ) . ' ';
+				if (!$newer_version_available) {
+					$body .= __('No further action is needed on your part.') . ' ';
 				}
 
 				// Can only reference the About screen if their update was successful.
-				list( $about_version ) = explode( '-', $core_update->current, 2 );
+				list($about_version) = explode('-', $core_update->current, 2);
 				/* translators: %s: WordPress version. */
-				$body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
-				$body .= "\n" . admin_url( 'about.php' );
+				$body .= sprintf(__('For more on version %s, see the About WordPress screen:'), $about_version);
+				$body .= "\n" . admin_url('about.php');
 
-				if ( $newer_version_available ) {
+				if ($newer_version_available) {
 					/* translators: %s: WordPress latest version. */
-					$body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
-					$body .= __( 'Updating is easy and only takes a few moments:' );
-					$body .= "\n" . network_admin_url( 'update-core.php' );
+					$body .= "\n\n" . sprintf(__('WordPress %s is also now available.'), $next_user_core_update->current) . ' ';
+					$body .= __('Updating is easy and only takes a few moments:');
+					$body .= "\n" . network_admin_url('update-core.php');
 				}
 
 				break;
@@ -768,7 +768,7 @@ 
 			case 'manual':
 				$body .= sprintf(
 					/* translators: 1: Home URL, 2: WordPress version. */
-					__( 'Please update your site at %1$s to WordPress %2$s.' ),
+					__('Please update your site at %1$s to WordPress %2$s.'),
 					home_url(),
 					$next_user_core_update->current
 				);
@@ -777,114 +777,114 @@ 
 
 				// Don't show this message if there is a newer version available.
 				// Potential for confusion, and also not useful for them to know at this point.
-				if ( 'fail' === $type && ! $newer_version_available ) {
-					$body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
+				if ('fail' === $type && !$newer_version_available) {
+					$body .= __('An attempt was made, but your site could not be updated automatically.') . ' ';
 				}
 
-				$body .= __( 'Updating is easy and only takes a few moments:' );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
+				$body .= __('Updating is easy and only takes a few moments:');
+				$body .= "\n" . network_admin_url('update-core.php');
 				break;
 
 			case 'critical':
-				if ( $newer_version_available ) {
+				if ($newer_version_available) {
 					$body .= sprintf(
 						/* translators: 1: Home URL, 2: WordPress version. */
-						__( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ),
+						__('Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.'),
 						home_url(),
 						$core_update->current
 					);
 				} else {
 					$body .= sprintf(
 						/* translators: 1: Home URL, 2: WordPress latest version. */
-						__( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ),
+						__('Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.'),
 						home_url(),
 						$core_update->current
 					);
 				}
 
-				$body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
+				$body .= "\n\n" . __("This means your site may be offline or broken. Don't panic; this can be fixed.");
 
-				$body .= "\n\n" . __( "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" );
-				$body .= "\n" . network_admin_url( 'update-core.php' );
+				$body .= "\n\n" . __("Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:");
+				$body .= "\n" . network_admin_url('update-core.php');
 				break;
 		}
 
-		$critical_support = 'critical' === $type && ! empty( $core_update->support_email );
-		if ( $critical_support ) {
+		$critical_support = 'critical' === $type && !empty($core_update->support_email);
+		if ($critical_support) {
 			// Support offer if available.
 			$body .= "\n\n" . sprintf(
 				/* translators: %s: Support email address. */
-				__( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ),
+				__('The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.'),
 				$core_update->support_email
 			);
 		} else {
 			// Add a note about the support forums.
-			$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-			$body .= "\n" . __( 'https://wordpress.org/support/forums/' );
+			$body .= "\n\n" . __('If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.');
+			$body .= "\n" . __('https://wordpress.org/support/forums/');
 		}
 
 		// Updates are important!
-		if ( 'success' !== $type || $newer_version_available ) {
-			$body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
+		if ('success' !== $type || $newer_version_available) {
+			$body .= "\n\n" . __('Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.');
 		}
 
-		if ( $critical_support ) {
-			$body .= ' ' . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
+		if ($critical_support) {
+			$body .= ' ' . __("If you reach out to us, we'll also ensure you'll never have this problem again.");
 		}
 
 		// If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
-		if ( 'success' === $type && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
-			$body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
+		if ('success' === $type && !$newer_version_available && (get_plugin_updates() || get_theme_updates())) {
+			$body .= "\n\n" . __('You also have some plugins or themes with updates available. Update them now:');
 			$body .= "\n" . network_admin_url();
 		}
 
-		$body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
+		$body .= "\n\n" . __('The WordPress Team') . "\n";
 
-		if ( 'critical' === $type && is_wp_error( $result ) ) {
+		if ('critical' === $type && is_wp_error($result)) {
 			$body .= "\n***\n\n";
 			/* translators: %s: WordPress version. */
-			$body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
-			$body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
-			$body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
+			$body .= sprintf(__('Your site was running version %s.'), get_bloginfo('version'));
+			$body .= ' ' . __('Some data that describes the error your site encountered has been put together.');
+			$body .= ' ' . __('Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:');
 
 			// If we had a rollback and we're still critical, then the rollback failed too.
 			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-			if ( 'rollback_was_required' === $result->get_error_code() ) {
-				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
+			if ('rollback_was_required' === $result->get_error_code()) {
+				$errors = array($result, $result->get_error_data()->update, $result->get_error_data()->rollback);
 			} else {
-				$errors = array( $result );
+				$errors = array($result);
 			}
 
-			foreach ( $errors as $error ) {
-				if ( ! is_wp_error( $error ) ) {
+			foreach ($errors as $error) {
+				if (!is_wp_error($error)) {
 					continue;
 				}
 
 				$error_code = $error->get_error_code();
 				/* translators: %s: Error code. */
-				$body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
+				$body .= "\n\n" . sprintf(__('Error code: %s'), $error_code);
 
-				if ( 'rollback_was_required' === $error_code ) {
+				if ('rollback_was_required' === $error_code) {
 					continue;
 				}
 
-				if ( $error->get_error_message() ) {
+				if ($error->get_error_message()) {
 					$body .= "\n" . $error->get_error_message();
 				}
 
 				$error_data = $error->get_error_data();
-				if ( $error_data ) {
-					$body .= "\n" . implode( ', ', (array) $error_data );
+				if ($error_data) {
+					$body .= "\n" . implode(', ', (array) $error_data);
 				}
 			}
 
 			$body .= "\n";
 		}
 
-		$to      = get_site_option( 'admin_email' );
+		$to      = get_site_option('admin_email');
 		$headers = '';
 
-		$email = compact( 'to', 'subject', 'body', 'headers' );
+		$email = compact('to', 'subject', 'body', 'headers');
 
 		/**
 		 * Filters the email sent following an automatic background core update.
@@ -905,9 +905,9 @@ 
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		$email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
+		$email = apply_filters('auto_core_update_email', $email, $type, $core_update, $result);
 
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+		wp_mail($email['to'], wp_specialchars_decode($email['subject']), $email['body'], $email['headers']);
 	}
 
 
@@ -918,11 +918,11 @@ 
 	 *
 	 * @param array $update_results The results of update tasks.
 	 */
-	protected function after_plugin_theme_update( $update_results ) {
+	protected function after_plugin_theme_update($update_results) {
 		$successful_updates = array();
 		$failed_updates     = array();
 
-		if ( ! empty( $update_results['plugin'] ) ) {
+		if (!empty($update_results['plugin'])) {
 			/**
 			 * Filters whether to send an email following an automatic background plugin update.
 			 *
@@ -932,11 +932,11 @@ 
 			 * @param bool  $enabled        True if plugin update notifications are enabled, false otherwise.
 			 * @param array $update_results The results of plugins update tasks.
 			 */
-			$notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
+			$notifications_enabled = apply_filters('auto_plugin_update_send_email', true, $update_results['plugin']);
 
-			if ( $notifications_enabled ) {
-				foreach ( $update_results['plugin'] as $update_result ) {
-					if ( true === $update_result->result ) {
+			if ($notifications_enabled) {
+				foreach ($update_results['plugin'] as $update_result) {
+					if (true === $update_result->result) {
 						$successful_updates['plugin'][] = $update_result;
 					} else {
 						$failed_updates['plugin'][] = $update_result;
@@ -945,7 +945,7 @@ 
 			}
 		}
 
-		if ( ! empty( $update_results['theme'] ) ) {
+		if (!empty($update_results['theme'])) {
 			/**
 			 * Filters whether to send an email following an automatic background theme update.
 			 *
@@ -955,11 +955,11 @@ 
 			 * @param bool  $enabled        True if theme update notifications are enabled, false otherwise.
 			 * @param array $update_results The results of theme update tasks.
 			 */
-			$notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
+			$notifications_enabled = apply_filters('auto_theme_update_send_email', true, $update_results['theme']);
 
-			if ( $notifications_enabled ) {
-				foreach ( $update_results['theme'] as $update_result ) {
-					if ( true === $update_result->result ) {
+			if ($notifications_enabled) {
+				foreach ($update_results['theme'] as $update_result) {
+					if (true === $update_result->result) {
 						$successful_updates['theme'][] = $update_result;
 					} else {
 						$failed_updates['theme'][] = $update_result;
@@ -968,16 +968,16 @@ 
 			}
 		}
 
-		if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
+		if (empty($successful_updates) && empty($failed_updates)) {
 			return;
 		}
 
-		if ( empty( $failed_updates ) ) {
-			$this->send_plugin_theme_email( 'success', $successful_updates, $failed_updates );
-		} elseif ( empty( $successful_updates ) ) {
-			$this->send_plugin_theme_email( 'fail', $successful_updates, $failed_updates );
+		if (empty($failed_updates)) {
+			$this->send_plugin_theme_email('success', $successful_updates, $failed_updates);
+		} elseif (empty($successful_updates)) {
+			$this->send_plugin_theme_email('fail', $successful_updates, $failed_updates);
 		} else {
-			$this->send_plugin_theme_email( 'mixed', $successful_updates, $failed_updates );
+			$this->send_plugin_theme_email('mixed', $successful_updates, $failed_updates);
 		}
 	}
 
@@ -990,70 +990,70 @@ 
 	 * @param array  $successful_updates A list of updates that succeeded.
 	 * @param array  $failed_updates     A list of updates that failed.
 	 */
-	protected function send_plugin_theme_email( $type, $successful_updates, $failed_updates ) {
+	protected function send_plugin_theme_email($type, $successful_updates, $failed_updates) {
 		// No updates were attempted.
-		if ( empty( $successful_updates ) && empty( $failed_updates ) ) {
+		if (empty($successful_updates) && empty($failed_updates)) {
 			return;
 		}
 
 		$unique_failures     = false;
-		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
+		$past_failure_emails = get_option('auto_plugin_theme_update_emails', array());
 
 		/*
 		 * When only failures have occurred, an email should only be sent if there are unique failures.
 		 * A failure is considered unique if an email has not been sent for an update attempt failure
 		 * to a plugin or theme with the same new_version.
 		 */
-		if ( 'fail' === $type ) {
-			foreach ( $failed_updates as $update_type => $failures ) {
-				foreach ( $failures as $failed_update ) {
-					if ( ! isset( $past_failure_emails[ $failed_update->item->{$update_type} ] ) ) {
+		if ('fail' === $type) {
+			foreach ($failed_updates as $update_type => $failures) {
+				foreach ($failures as $failed_update) {
+					if (!isset($past_failure_emails[$failed_update->item->{$update_type}])) {
 						$unique_failures = true;
 						continue;
 					}
 
 					// Check that the failure represents a new failure based on the new_version.
-					if ( version_compare( $past_failure_emails[ $failed_update->item->{$update_type} ], $failed_update->item->new_version, '<' ) ) {
+					if (version_compare($past_failure_emails[$failed_update->item->{$update_type}], $failed_update->item->new_version, '<')) {
 						$unique_failures = true;
 					}
 				}
 			}
 
-			if ( ! $unique_failures ) {
+			if (!$unique_failures) {
 				return;
 			}
 		}
 
 		$body               = array();
-		$successful_plugins = ( ! empty( $successful_updates['plugin'] ) );
-		$successful_themes  = ( ! empty( $successful_updates['theme'] ) );
-		$failed_plugins     = ( ! empty( $failed_updates['plugin'] ) );
-		$failed_themes      = ( ! empty( $failed_updates['theme'] ) );
+		$successful_plugins = (!empty($successful_updates['plugin']));
+		$successful_themes  = (!empty($successful_updates['theme']));
+		$failed_plugins     = (!empty($failed_updates['plugin']));
+		$failed_themes      = (!empty($failed_updates['theme']));
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success':
-				if ( $successful_plugins && $successful_themes ) {
+				if ($successful_plugins && $successful_themes) {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins and themes have automatically updated' );
+					$subject = __('[%s] Some plugins and themes have automatically updated');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Some plugins and themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+						__('Howdy! Some plugins and themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.'),
 						home_url()
 					);
-				} elseif ( $successful_plugins ) {
+				} elseif ($successful_plugins) {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins were automatically updated' );
+					$subject = __('[%s] Some plugins were automatically updated');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Some plugins have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+						__('Howdy! Some plugins have automatically updated to their latest versions on your site at %s. No further action is needed on your part.'),
 						home_url()
 					);
 				} else {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some themes were automatically updated' );
+					$subject = __('[%s] Some themes were automatically updated');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Some themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.' ),
+						__('Howdy! Some themes have automatically updated to their latest versions on your site at %s. No further action is needed on your part.'),
 						home_url()
 					);
 				}
@@ -1061,28 +1061,28 @@ 
 				break;
 			case 'fail':
 			case 'mixed':
-				if ( $failed_plugins && $failed_themes ) {
+				if ($failed_plugins && $failed_themes) {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins and themes have failed to update' );
+					$subject = __('[%s] Some plugins and themes have failed to update');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Plugins and themes failed to update on your site at %s.' ),
+						__('Howdy! Plugins and themes failed to update on your site at %s.'),
 						home_url()
 					);
-				} elseif ( $failed_plugins ) {
+				} elseif ($failed_plugins) {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some plugins have failed to update' );
+					$subject = __('[%s] Some plugins have failed to update');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Plugins failed to update on your site at %s.' ),
+						__('Howdy! Plugins failed to update on your site at %s.'),
 						home_url()
 					);
 				} else {
 					/* translators: %s: Site title. */
-					$subject = __( '[%s] Some themes have failed to update' );
+					$subject = __('[%s] Some themes have failed to update');
 					$body[]  = sprintf(
 						/* translators: %s: Home URL. */
-						__( 'Howdy! Themes failed to update on your site at %s.' ),
+						__('Howdy! Themes failed to update on your site at %s.'),
 						home_url()
 					);
 				}
@@ -1090,20 +1090,20 @@ 
 				break;
 		}
 
-		if ( in_array( $type, array( 'fail', 'mixed' ), true ) ) {
+		if (in_array($type, array('fail', 'mixed'), true)) {
 			$body[] = "\n";
-			$body[] = __( 'Please check your site now. It’s possible that everything is working. If there are updates available, you should update.' );
+			$body[] = __('Please check your site now. It’s possible that everything is working. If there are updates available, you should update.');
 			$body[] = "\n";
 
 			// List failed plugin updates.
-			if ( ! empty( $failed_updates['plugin'] ) ) {
-				$body[] = __( 'These plugins failed to update:' );
+			if (!empty($failed_updates['plugin'])) {
+				$body[] = __('These plugins failed to update:');
 
-				foreach ( $failed_updates['plugin'] as $item ) {
-					if ( $item->item->current_version ) {
+				foreach ($failed_updates['plugin'] as $item) {
+					if ($item->item->current_version) {
 						$body[] = sprintf(
 							/* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
+							__('- %1$s (from version %2$s to %3$s)'),
 							$item->name,
 							$item->item->current_version,
 							$item->item->new_version
@@ -1111,27 +1111,27 @@ 
 					} else {
 						$body[] = sprintf(
 							/* translators: 1: Plugin name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
+							__('- %1$s version %2$s'),
 							$item->name,
 							$item->item->new_version
 						);
 					}
 
-					$past_failure_emails[ $item->item->plugin ] = $item->item->new_version;
+					$past_failure_emails[$item->item->plugin] = $item->item->new_version;
 				}
 
 				$body[] = "\n";
 			}
 
 			// List failed theme updates.
-			if ( ! empty( $failed_updates['theme'] ) ) {
-				$body[] = __( 'These themes failed to update:' );
+			if (!empty($failed_updates['theme'])) {
+				$body[] = __('These themes failed to update:');
 
-				foreach ( $failed_updates['theme'] as $item ) {
-					if ( $item->item->current_version ) {
+				foreach ($failed_updates['theme'] as $item) {
+					if ($item->item->current_version) {
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
+							__('- %1$s (from version %2$s to %3$s)'),
 							$item->name,
 							$item->item->current_version,
 							$item->item->new_version
@@ -1139,13 +1139,13 @@ 
 					} else {
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
+							__('- %1$s version %2$s'),
 							$item->name,
 							$item->item->new_version
 						);
 					}
 
-					$past_failure_emails[ $item->item->theme ] = $item->item->new_version;
+					$past_failure_emails[$item->item->theme] = $item->item->new_version;
 				}
 
 				$body[] = "\n";
@@ -1153,18 +1153,18 @@ 
 		}
 
 		// List successful updates.
-		if ( in_array( $type, array( 'success', 'mixed' ), true ) ) {
+		if (in_array($type, array('success', 'mixed'), true)) {
 			$body[] = "\n";
 
 			// List successful plugin updates.
-			if ( ! empty( $successful_updates['plugin'] ) ) {
-				$body[] = __( 'These plugins are now up to date:' );
+			if (!empty($successful_updates['plugin'])) {
+				$body[] = __('These plugins are now up to date:');
 
-				foreach ( $successful_updates['plugin'] as $item ) {
-					if ( $item->item->current_version ) {
+				foreach ($successful_updates['plugin'] as $item) {
+					if ($item->item->current_version) {
 						$body[] = sprintf(
 							/* translators: 1: Plugin name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
+							__('- %1$s (from version %2$s to %3$s)'),
 							$item->name,
 							$item->item->current_version,
 							$item->item->new_version
@@ -1172,27 +1172,27 @@ 
 					} else {
 						$body[] = sprintf(
 							/* translators: 1: Plugin name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
+							__('- %1$s version %2$s'),
 							$item->name,
 							$item->item->new_version
 						);
 					}
 
-					unset( $past_failure_emails[ $item->item->plugin ] );
+					unset($past_failure_emails[$item->item->plugin]);
 				}
 
 				$body[] = "\n";
 			}
 
 			// List successful theme updates.
-			if ( ! empty( $successful_updates['theme'] ) ) {
-				$body[] = __( 'These themes are now up to date:' );
+			if (!empty($successful_updates['theme'])) {
+				$body[] = __('These themes are now up to date:');
 
-				foreach ( $successful_updates['theme'] as $item ) {
-					if ( $item->item->current_version ) {
+				foreach ($successful_updates['theme'] as $item) {
+					if ($item->item->current_version) {
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
-							__( '- %1$s (from version %2$s to %3$s)' ),
+							__('- %1$s (from version %2$s to %3$s)'),
 							$item->name,
 							$item->item->current_version,
 							$item->item->new_version
@@ -1200,54 +1200,54 @@ 
 					} else {
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Version number. */
-							__( '- %1$s version %2$s' ),
+							__('- %1$s version %2$s'),
 							$item->name,
 							$item->item->new_version
 						);
 					}
 
-					unset( $past_failure_emails[ $item->item->theme ] );
+					unset($past_failure_emails[$item->item->theme]);
 				}
 
 				$body[] = "\n";
 			}
 		}
 
-		if ( $failed_plugins ) {
+		if ($failed_plugins) {
 			$body[] = sprintf(
 				/* translators: %s: Plugins screen URL. */
-				__( 'To manage plugins on your site, visit the Plugins page: %s' ),
-				admin_url( 'plugins.php' )
+				__('To manage plugins on your site, visit the Plugins page: %s'),
+				admin_url('plugins.php')
 			);
 			$body[] = "\n";
 		}
 
-		if ( $failed_themes ) {
+		if ($failed_themes) {
 			$body[] = sprintf(
 				/* translators: %s: Themes screen URL. */
-				__( 'To manage themes on your site, visit the Themes page: %s' ),
-				admin_url( 'themes.php' )
+				__('To manage themes on your site, visit the Themes page: %s'),
+				admin_url('themes.php')
 			);
 			$body[] = "\n";
 		}
 
 		// Add a note about the support forums.
-		$body[] = __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-		$body[] = __( 'https://wordpress.org/support/forums/' );
-		$body[] = "\n" . __( 'The WordPress Team' );
+		$body[] = __('If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.');
+		$body[] = __('https://wordpress.org/support/forums/');
+		$body[] = "\n" . __('The WordPress Team');
 
-		if ( '' !== get_option( 'blogname' ) ) {
-			$site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		if ('' !== get_option('blogname')) {
+			$site_title = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 		} else {
-			$site_title = parse_url( home_url(), PHP_URL_HOST );
+			$site_title = parse_url(home_url(), PHP_URL_HOST);
 		}
 
-		$body    = implode( "\n", $body );
-		$to      = get_site_option( 'admin_email' );
-		$subject = sprintf( $subject, $site_title );
+		$body    = implode("\n", $body);
+		$to      = get_site_option('admin_email');
+		$subject = sprintf($subject, $site_title);
 		$headers = '';
 
-		$email = compact( 'to', 'subject', 'body', 'headers' );
+		$email = compact('to', 'subject', 'body', 'headers');
 
 		/**
 		 * Filters the email sent following an automatic background update for plugins and themes.
@@ -1267,12 +1267,12 @@ 
 		 * @param array  $successful_updates A list of updates that succeeded.
 		 * @param array  $failed_updates     A list of updates that failed.
 		 */
-		$email = apply_filters( 'auto_plugin_theme_update_email', $email, $type, $successful_updates, $failed_updates );
+		$email = apply_filters('auto_plugin_theme_update_email', $email, $type, $successful_updates, $failed_updates);
 
-		$result = wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+		$result = wp_mail($email['to'], wp_specialchars_decode($email['subject']), $email['body'], $email['headers']);
 
-		if ( $result ) {
-			update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+		if ($result) {
+			update_option('auto_plugin_theme_update_emails', $past_failure_emails);
 		}
 	}
 
@@ -1283,26 +1283,26 @@ 
 	 */
 	protected function send_debug_email() {
 		$update_count = 0;
-		foreach ( $this->update_results as $type => $updates ) {
-			$update_count += count( $updates );
+		foreach ($this->update_results as $type => $updates) {
+			$update_count += count($updates);
 		}
 
 		$body     = array();
 		$failures = 0;
 
 		/* translators: %s: Network home URL. */
-		$body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
+		$body[] = sprintf(__('WordPress site: %s'), network_home_url('/'));
 
 		// Core.
-		if ( isset( $this->update_results['core'] ) ) {
+		if (isset($this->update_results['core'])) {
 			$result = $this->update_results['core'][0];
 
-			if ( $result->result && ! is_wp_error( $result->result ) ) {
+			if ($result->result && !is_wp_error($result->result)) {
 				/* translators: %s: WordPress version. */
-				$body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
+				$body[] = sprintf(__('SUCCESS: WordPress was successfully updated to %s'), $result->name);
 			} else {
 				/* translators: %s: WordPress version. */
-				$body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
+				$body[] = sprintf(__('FAILED: WordPress failed to update to %s'), $result->name);
 				$failures++;
 			}
 
@@ -1310,41 +1310,41 @@ 
 		}
 
 		// Plugins, Themes, Translations.
-		foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) ) {
+		foreach (array('plugin', 'theme', 'translation') as $type) {
+			if (!isset($this->update_results[$type])) {
 				continue;
 			}
 
-			$success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
+			$success_items = wp_list_filter($this->update_results[$type], array('result' => true));
 
-			if ( $success_items ) {
+			if ($success_items) {
 				$messages = array(
-					'plugin'      => __( 'The following plugins were successfully updated:' ),
-					'theme'       => __( 'The following themes were successfully updated:' ),
-					'translation' => __( 'The following translations were successfully updated:' ),
+					'plugin'      => __('The following plugins were successfully updated:'),
+					'theme'       => __('The following themes were successfully updated:'),
+					'translation' => __('The following translations were successfully updated:'),
 				);
 
-				$body[] = $messages[ $type ];
-				foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
+				$body[] = $messages[$type];
+				foreach (wp_list_pluck($success_items, 'name') as $name) {
 					/* translators: %s: Name of plugin / theme / translation. */
-					$body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
+					$body[] = ' * ' . sprintf(__('SUCCESS: %s'), $name);
 				}
 			}
 
-			if ( $success_items !== $this->update_results[ $type ] ) {
+			if ($success_items !== $this->update_results[$type]) {
 				// Failed updates.
 				$messages = array(
-					'plugin'      => __( 'The following plugins failed to update:' ),
-					'theme'       => __( 'The following themes failed to update:' ),
-					'translation' => __( 'The following translations failed to update:' ),
+					'plugin'      => __('The following plugins failed to update:'),
+					'theme'       => __('The following themes failed to update:'),
+					'translation' => __('The following translations failed to update:'),
 				);
 
-				$body[] = $messages[ $type ];
+				$body[] = $messages[$type];
 
-				foreach ( $this->update_results[ $type ] as $item ) {
-					if ( ! $item->result || is_wp_error( $item->result ) ) {
+				foreach ($this->update_results[$type] as $item) {
+					if (!$item->result || is_wp_error($item->result)) {
 						/* translators: %s: Name of plugin / theme / translation. */
-						$body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
+						$body[] = ' * ' . sprintf(__('FAILED: %s'), $item->name);
 						$failures++;
 					}
 				}
@@ -1353,13 +1353,13 @@ 
 			$body[] = '';
 		}
 
-		if ( '' !== get_bloginfo( 'name' ) ) {
-			$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+		if ('' !== get_bloginfo('name')) {
+			$site_title = wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 		} else {
-			$site_title = parse_url( home_url(), PHP_URL_HOST );
+			$site_title = parse_url(home_url(), PHP_URL_HOST);
 		}
 
-		if ( $failures ) {
+		if ($failures) {
 			$body[] = trim(
 				__(
 					"BETA TESTING?
@@ -1377,10 +1377,10 @@ 
 			$body[] = '';
 
 			/* translators: Background update failed notification email subject. %s: Site title. */
-			$subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
+			$subject = sprintf(__('[%s] Background Update Failed'), $site_title);
 		} else {
 			/* translators: Background update finished notification email subject. %s: Site title. */
-			$subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
+			$subject = sprintf(__('[%s] Background Update Finished'), $site_title);
 		}
 
 		$body[] = trim(
@@ -1391,42 +1391,42 @@ 
 		);
 		$body[] = '';
 
-		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) ) {
+		foreach (array('core', 'plugin', 'theme', 'translation') as $type) {
+			if (!isset($this->update_results[$type])) {
 				continue;
 			}
 
-			foreach ( $this->update_results[ $type ] as $update ) {
+			foreach ($this->update_results[$type] as $update) {
 				$body[] = $update->name;
-				$body[] = str_repeat( '-', strlen( $update->name ) );
+				$body[] = str_repeat('-', strlen($update->name));
 
-				foreach ( $update->messages as $message ) {
-					$body[] = '  ' . html_entity_decode( str_replace( '&#8230;', '...', $message ) );
+				foreach ($update->messages as $message) {
+					$body[] = '  ' . html_entity_decode(str_replace('&#8230;', '...', $message));
 				}
 
-				if ( is_wp_error( $update->result ) ) {
-					$results = array( 'update' => $update->result );
+				if (is_wp_error($update->result)) {
+					$results = array('update' => $update->result);
 
 					// If we rolled back, we want to know an error that occurred then too.
-					if ( 'rollback_was_required' === $update->result->get_error_code() ) {
+					if ('rollback_was_required' === $update->result->get_error_code()) {
 						$results = (array) $update->result->get_error_data();
 					}
 
-					foreach ( $results as $result_type => $result ) {
-						if ( ! is_wp_error( $result ) ) {
+					foreach ($results as $result_type => $result) {
+						if (!is_wp_error($result)) {
 							continue;
 						}
 
-						if ( 'rollback' === $result_type ) {
+						if ('rollback' === $result_type) {
 							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Rollback Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+							$body[] = '  ' . sprintf(__('Rollback Error: [%1$s] %2$s'), $result->get_error_code(), $result->get_error_message());
 						} else {
 							/* translators: 1: Error code, 2: Error message. */
-							$body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
+							$body[] = '  ' . sprintf(__('Error: [%1$s] %2$s'), $result->get_error_code(), $result->get_error_message());
 						}
 
-						if ( $result->get_error_data() ) {
-							$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+						if ($result->get_error_data()) {
+							$body[] = '         ' . implode(', ', (array) $result->get_error_data());
 						}
 					}
 				}
@@ -1436,9 +1436,9 @@ 
 		}
 
 		$email = array(
-			'to'      => get_site_option( 'admin_email' ),
+			'to'      => get_site_option('admin_email'),
 			'subject' => $subject,
-			'body'    => implode( "\n", $body ),
+			'body'    => implode("\n", $body),
 			'headers' => '',
 		);
 
@@ -1460,8 +1460,8 @@ 
 		 * @param int   $failures The number of failures encountered while upgrading.
 		 * @param mixed $results  The results of all attempted updates.
 		 */
-		$email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
+		$email = apply_filters('automatic_updates_debug_email', $email, $failures, $this->update_results);
 
-		wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+		wp_mail($email['to'], wp_specialchars_decode($email['subject']), $email['body'], $email['headers']);
 	}
 }

brighty/wp-admin/includes/menu.php

Indentation +245 added lines, -245 removed lines

@@ -8,66 +8,66 @@ 
 
 if ( is_network_admin() ) {
 
-	/**
-	 * Fires before the administration menu loads in the Network Admin.
-	 *
-	 * The hook fires before menus and sub-menus are removed based on user privileges.
-	 *
-	 * @private
-	 * @since 3.1.0
-	 */
-	do_action( '_network_admin_menu' );
+    /**
+     * Fires before the administration menu loads in the Network Admin.
+     *
+     * The hook fires before menus and sub-menus are removed based on user privileges.
+     *
+     * @private
+     * @since 3.1.0
+     */
+    do_action( '_network_admin_menu' );
 } elseif ( is_user_admin() ) {
 
-	/**
-	 * Fires before the administration menu loads in the User Admin.
-	 *
-	 * The hook fires before menus and sub-menus are removed based on user privileges.
-	 *
-	 * @private
-	 * @since 3.1.0
-	 */
-	do_action( '_user_admin_menu' );
+    /**
+     * Fires before the administration menu loads in the User Admin.
+     *
+     * The hook fires before menus and sub-menus are removed based on user privileges.
+     *
+     * @private
+     * @since 3.1.0
+     */
+    do_action( '_user_admin_menu' );
 } else {
 
-	/**
-	 * Fires before the administration menu loads in the admin.
-	 *
-	 * The hook fires before menus and sub-menus are removed based on user privileges.
-	 *
-	 * @private
-	 * @since 2.2.0
-	 */
-	do_action( '_admin_menu' );
+    /**
+     * Fires before the administration menu loads in the admin.
+     *
+     * The hook fires before menus and sub-menus are removed based on user privileges.
+     *
+     * @private
+     * @since 2.2.0
+     */
+    do_action( '_admin_menu' );
 }
 
 // Create list of page plugin hook names.
 foreach ( $menu as $menu_page ) {
-	$pos = strpos( $menu_page[2], '?' );
-	if ( false !== $pos ) {
-		// Handle post_type=post|page|foo pages.
-		$hook_name = substr( $menu_page[2], 0, $pos );
-		$hook_args = substr( $menu_page[2], $pos + 1 );
-		wp_parse_str( $hook_args, $hook_args );
-		// Set the hook name to be the post type.
-		if ( isset( $hook_args['post_type'] ) ) {
-			$hook_name = $hook_args['post_type'];
-		} else {
-			$hook_name = basename( $hook_name, '.php' );
-		}
-		unset( $hook_args );
-	} else {
-		$hook_name = basename( $menu_page[2], '.php' );
-	}
-	$hook_name = sanitize_title( $hook_name );
-
-	if ( isset( $compat[ $hook_name ] ) ) {
-		$hook_name = $compat[ $hook_name ];
-	} elseif ( ! $hook_name ) {
-		continue;
-	}
-
-	$admin_page_hooks[ $menu_page[2] ] = $hook_name;
+    $pos = strpos( $menu_page[2], '?' );
+    if ( false !== $pos ) {
+        // Handle post_type=post|page|foo pages.
+        $hook_name = substr( $menu_page[2], 0, $pos );
+        $hook_args = substr( $menu_page[2], $pos + 1 );
+        wp_parse_str( $hook_args, $hook_args );
+        // Set the hook name to be the post type.
+        if ( isset( $hook_args['post_type'] ) ) {
+            $hook_name = $hook_args['post_type'];
+        } else {
+            $hook_name = basename( $hook_name, '.php' );
+        }
+        unset( $hook_args );
+    } else {
+        $hook_name = basename( $menu_page[2], '.php' );
+    }
+    $hook_name = sanitize_title( $hook_name );
+
+    if ( isset( $compat[ $hook_name ] ) ) {
+        $hook_name = $compat[ $hook_name ];
+    } elseif ( ! $hook_name ) {
+        continue;
+    }
+
+    $admin_page_hooks[ $menu_page[2] ] = $hook_name;
 }
 unset( $menu_page, $compat );
 
@@ -75,17 +75,17 @@ 
 $_wp_menu_nopriv    = array();
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ( $submenu as $parent => $sub ) {
-	foreach ( $sub as $index => $data ) {
-		if ( ! current_user_can( $data[1] ) ) {
-			unset( $submenu[ $parent ][ $index ] );
-			$_wp_submenu_nopriv[ $parent ][ $data[2] ] = true;
-		}
-	}
-	unset( $index, $data );
-
-	if ( empty( $submenu[ $parent ] ) ) {
-		unset( $submenu[ $parent ] );
-	}
+    foreach ( $sub as $index => $data ) {
+        if ( ! current_user_can( $data[1] ) ) {
+            unset( $submenu[ $parent ][ $index ] );
+            $_wp_submenu_nopriv[ $parent ][ $data[2] ] = true;
+        }
+    }
+    unset( $index, $data );
+
+    if ( empty( $submenu[ $parent ] ) ) {
+        unset( $submenu[ $parent ] );
+    }
 }
 unset( $sub, $parent );
 
@@ -95,64 +95,64 @@ 
  * will have the next submenu in line be assigned as the new menu parent.
  */
 foreach ( $menu as $id => $data ) {
-	if ( empty( $submenu[ $data[2] ] ) ) {
-		continue;
-	}
-	$subs       = $submenu[ $data[2] ];
-	$first_sub  = reset( $subs );
-	$old_parent = $data[2];
-	$new_parent = $first_sub[2];
-	/*
+    if ( empty( $submenu[ $data[2] ] ) ) {
+        continue;
+    }
+    $subs       = $submenu[ $data[2] ];
+    $first_sub  = reset( $subs );
+    $old_parent = $data[2];
+    $new_parent = $first_sub[2];
+    /*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
-		$_wp_real_parent_file[ $old_parent ] = $new_parent;
-		$menu[ $id ][2]                      = $new_parent;
-
-		foreach ( $submenu[ $old_parent ] as $index => $data ) {
-			$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
-			unset( $submenu[ $old_parent ][ $index ] );
-		}
-		unset( $submenu[ $old_parent ], $index );
-
-		if ( isset( $_wp_submenu_nopriv[ $old_parent ] ) ) {
-			$_wp_submenu_nopriv[ $new_parent ] = $_wp_submenu_nopriv[ $old_parent ];
-		}
-	}
+    if ( $new_parent != $old_parent ) {
+        $_wp_real_parent_file[ $old_parent ] = $new_parent;
+        $menu[ $id ][2]                      = $new_parent;
+
+        foreach ( $submenu[ $old_parent ] as $index => $data ) {
+            $submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
+            unset( $submenu[ $old_parent ][ $index ] );
+        }
+        unset( $submenu[ $old_parent ], $index );
+
+        if ( isset( $_wp_submenu_nopriv[ $old_parent ] ) ) {
+            $_wp_submenu_nopriv[ $new_parent ] = $_wp_submenu_nopriv[ $old_parent ];
+        }
+    }
 }
 unset( $id, $data, $subs, $first_sub, $old_parent, $new_parent );
 
 if ( is_network_admin() ) {
 
-	/**
-	 * Fires before the administration menu loads in the Network Admin.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string $context Empty context.
-	 */
-	do_action( 'network_admin_menu', '' );
+    /**
+     * Fires before the administration menu loads in the Network Admin.
+     *
+     * @since 3.1.0
+     *
+     * @param string $context Empty context.
+     */
+    do_action( 'network_admin_menu', '' );
 } elseif ( is_user_admin() ) {
 
-	/**
-	 * Fires before the administration menu loads in the User Admin.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string $context Empty context.
-	 */
-	do_action( 'user_admin_menu', '' );
+    /**
+     * Fires before the administration menu loads in the User Admin.
+     *
+     * @since 3.1.0
+     *
+     * @param string $context Empty context.
+     */
+    do_action( 'user_admin_menu', '' );
 } else {
 
-	/**
-	 * Fires before the administration menu loads in the admin.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param string $context Empty context.
-	 */
-	do_action( 'admin_menu', '' );
+    /**
+     * Fires before the administration menu loads in the admin.
+     *
+     * @since 1.5.0
+     *
+     * @param string $context Empty context.
+     */
+    do_action( 'admin_menu', '' );
 }
 
 /*
@@ -160,29 +160,29 @@ 
  * that the user does not have. Run re-parent loop again.
  */
 foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can( $data[1] ) ) {
-		$_wp_menu_nopriv[ $data[2] ] = true;
-	}
+    if ( ! current_user_can( $data[1] ) ) {
+        $_wp_menu_nopriv[ $data[2] ] = true;
+    }
 
-	/*
+    /*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
-		$subs      = $submenu[ $data[2] ];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] ) {
-			unset( $submenu[ $data[2] ] );
-		}
-	}
-
-	// If submenu is empty...
-	if ( empty( $submenu[ $data[2] ] ) ) {
-		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[ $data[2] ] ) ) {
-			unset( $menu[ $id ] );
-		}
-	}
+    if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
+        $subs      = $submenu[ $data[2] ];
+        $first_sub = reset( $subs );
+        if ( $data[2] == $first_sub[2] ) {
+            unset( $submenu[ $data[2] ] );
+        }
+    }
+
+    // If submenu is empty...
+    if ( empty( $submenu[ $data[2] ] ) ) {
+        // And user doesn't have privs, remove menu.
+        if ( isset( $_wp_menu_nopriv[ $data[2] ] ) ) {
+            unset( $menu[ $id ] );
+        }
+    }
 }
 unset( $id, $data, $subs, $first_sub );
 
@@ -196,11 +196,11 @@ 
  * @return string The string with the CSS class added.
  */
 function add_cssclass( $class_to_add, $classes ) {
-	if ( empty( $classes ) ) {
-		return $class_to_add;
-	}
+    if ( empty( $classes ) ) {
+        return $class_to_add;
+    }
 
-	return $classes . ' ' . $class_to_add;
+    return $classes . ' ' . $class_to_add;
 }
 
 /**
@@ -214,49 +214,49 @@ 
  * @return array The array of administration menu items with the CSS classes added.
  */
 function add_menu_classes( $menu ) {
-	$first_item  = false;
-	$last_order  = false;
-	$items_count = count( $menu );
-	$i           = 0;
-
-	foreach ( $menu as $order => $top ) {
-		$i++;
-
-		if ( 0 == $order ) { // Dashboard is always shown/single.
-			$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
-			$last_order = 0;
-			continue;
-		}
-
-		if ( 0 === strpos( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
-			$first_item             = true;
-			$classes                = $menu[ $last_order ][4];
-			$menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
-			continue;
-		}
-
-		if ( $first_item ) {
-			$classes           = $menu[ $order ][4];
-			$menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
-			$first_item        = false;
-		}
-
-		if ( $i == $items_count ) { // Last item.
-			$classes           = $menu[ $order ][4];
-			$menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
-		}
-
-		$last_order = $order;
-	}
-
-	/**
-	 * Filters administration menu array with classes added for top-level items.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param array $menu Associative array of administration menu items.
-	 */
-	return apply_filters( 'add_menu_classes', $menu );
+    $first_item  = false;
+    $last_order  = false;
+    $items_count = count( $menu );
+    $i           = 0;
+
+    foreach ( $menu as $order => $top ) {
+        $i++;
+
+        if ( 0 == $order ) { // Dashboard is always shown/single.
+            $menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
+            $last_order = 0;
+            continue;
+        }
+
+        if ( 0 === strpos( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
+            $first_item             = true;
+            $classes                = $menu[ $last_order ][4];
+            $menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
+            continue;
+        }
+
+        if ( $first_item ) {
+            $classes           = $menu[ $order ][4];
+            $menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
+            $first_item        = false;
+        }
+
+        if ( $i == $items_count ) { // Last item.
+            $classes           = $menu[ $order ][4];
+            $menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
+        }
+
+        $last_order = $order;
+    }
+
+    /**
+     * Filters administration menu array with classes added for top-level items.
+     *
+     * @since 2.7.0
+     *
+     * @param array $menu Associative array of administration menu items.
+     */
+    return apply_filters( 'add_menu_classes', $menu );
 }
 
 uksort( $menu, 'strnatcasecmp' ); // Make it all pretty.
@@ -271,76 +271,76 @@ 
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
 if ( apply_filters( 'custom_menu_order', false ) ) {
-	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
-		$menu_order[] = $menu_item[2];
-	}
-	unset( $menu_item );
-	$default_menu_order = $menu_order;
-
-	/**
-	 * Filters the order of administration menu items.
-	 *
-	 * A truthy value must first be passed to the {@see 'custom_menu_order'} filter
-	 * for this filter to work. Use the following to enable custom menu ordering:
-	 *
-	 *     add_filter( 'custom_menu_order', '__return_true' );
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param array $menu_order An ordered array of menu items.
-	 */
-	$menu_order         = apply_filters( 'menu_order', $menu_order );
-	$menu_order         = array_flip( $menu_order );
-	$default_menu_order = array_flip( $default_menu_order );
-
-	/**
-	 * @global array $menu_order
-	 * @global array $default_menu_order
-	 *
-	 * @param array $a
-	 * @param array $b
-	 * @return int
-	 */
-	function sort_menu( $a, $b ) {
-		global $menu_order, $default_menu_order;
-		$a = $a[2];
-		$b = $b[2];
-		if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
-			return -1;
-		} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
-			return 1;
-		} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
-			if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
-				return 0;
-			}
-			return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
-		} else {
-			return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
-		}
-	}
-
-	usort( $menu, 'sort_menu' );
-	unset( $menu_order, $default_menu_order );
+    $menu_order = array();
+    foreach ( $menu as $menu_item ) {
+        $menu_order[] = $menu_item[2];
+    }
+    unset( $menu_item );
+    $default_menu_order = $menu_order;
+
+    /**
+     * Filters the order of administration menu items.
+     *
+     * A truthy value must first be passed to the {@see 'custom_menu_order'} filter
+     * for this filter to work. Use the following to enable custom menu ordering:
+     *
+     *     add_filter( 'custom_menu_order', '__return_true' );
+     *
+     * @since 2.8.0
+     *
+     * @param array $menu_order An ordered array of menu items.
+     */
+    $menu_order         = apply_filters( 'menu_order', $menu_order );
+    $menu_order         = array_flip( $menu_order );
+    $default_menu_order = array_flip( $default_menu_order );
+
+    /**
+     * @global array $menu_order
+     * @global array $default_menu_order
+     *
+     * @param array $a
+     * @param array $b
+     * @return int
+     */
+    function sort_menu( $a, $b ) {
+        global $menu_order, $default_menu_order;
+        $a = $a[2];
+        $b = $b[2];
+        if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
+            return -1;
+        } elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
+            return 1;
+        } elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
+            if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
+                return 0;
+            }
+            return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
+        } else {
+            return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
+        }
+    }
+
+    usort( $menu, 'sort_menu' );
+    unset( $menu_order, $default_menu_order );
 }
 
 // Prevent adjacent separators.
 $prev_menu_was_separator = false;
 foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+    if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
 
-		// This item is not a separator, so falsey the toggler and do nothing.
-		$prev_menu_was_separator = false;
-	} else {
+        // This item is not a separator, so falsey the toggler and do nothing.
+        $prev_menu_was_separator = false;
+    } else {
 
-		// The previous item was a separator, so unset this one.
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
-		}
+        // The previous item was a separator, so unset this one.
+        if ( true === $prev_menu_was_separator ) {
+            unset( $menu[ $id ] );
+        }
 
-		// This item is a separator, so truthy the toggler and move on.
-		$prev_menu_was_separator = true;
-	}
+        // This item is a separator, so truthy the toggler and move on.
+        $prev_menu_was_separator = true;
+    }
 }
 unset( $id, $data, $prev_menu_was_separator );
 
@@ -348,20 +348,20 @@ 
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
 if ( ! empty( $menu ) && 'wp-menu-separator' === $menu[ $last_menu_key ][4] ) {
-	unset( $menu[ $last_menu_key ] );
+    unset( $menu[ $last_menu_key ] );
 }
 unset( $last_menu_key );
 
 if ( ! user_can_access_admin_page() ) {
 
-	/**
-	 * Fires when access to an admin page is denied.
-	 *
-	 * @since 2.5.0
-	 */
-	do_action( 'admin_page_access_denied' );
+    /**
+     * Fires when access to an admin page is denied.
+     *
+     * @since 2.5.0
+     */
+    do_action( 'admin_page_access_denied' );
 
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
 }
 
 $menu = add_menu_classes( $menu );

Spacing +108 added lines, -108 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -16,8 +16,8 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_network_admin_menu' );
-} elseif ( is_user_admin() ) {
+	do_action('_network_admin_menu');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -27,7 +27,7 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_user_admin_menu' );
+	do_action('_user_admin_menu');
 } else {
 
 	/**
@@ -38,92 +38,92 @@ 
 	 * @private
 	 * @since 2.2.0
 	 */
-	do_action( '_admin_menu' );
+	do_action('_admin_menu');
 }
 
 // Create list of page plugin hook names.
-foreach ( $menu as $menu_page ) {
-	$pos = strpos( $menu_page[2], '?' );
-	if ( false !== $pos ) {
+foreach ($menu as $menu_page) {
+	$pos = strpos($menu_page[2], '?');
+	if (false !== $pos) {
 		// Handle post_type=post|page|foo pages.
-		$hook_name = substr( $menu_page[2], 0, $pos );
-		$hook_args = substr( $menu_page[2], $pos + 1 );
-		wp_parse_str( $hook_args, $hook_args );
+		$hook_name = substr($menu_page[2], 0, $pos);
+		$hook_args = substr($menu_page[2], $pos + 1);
+		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset( $hook_args['post_type'] ) ) {
+		if (isset($hook_args['post_type'])) {
 			$hook_name = $hook_args['post_type'];
 		} else {
-			$hook_name = basename( $hook_name, '.php' );
+			$hook_name = basename($hook_name, '.php');
 		}
-		unset( $hook_args );
+		unset($hook_args);
 	} else {
-		$hook_name = basename( $menu_page[2], '.php' );
+		$hook_name = basename($menu_page[2], '.php');
 	}
-	$hook_name = sanitize_title( $hook_name );
+	$hook_name = sanitize_title($hook_name);
 
-	if ( isset( $compat[ $hook_name ] ) ) {
-		$hook_name = $compat[ $hook_name ];
-	} elseif ( ! $hook_name ) {
+	if (isset($compat[$hook_name])) {
+		$hook_name = $compat[$hook_name];
+	} elseif (!$hook_name) {
 		continue;
 	}
 
-	$admin_page_hooks[ $menu_page[2] ] = $hook_name;
+	$admin_page_hooks[$menu_page[2]] = $hook_name;
 }
-unset( $menu_page, $compat );
+unset($menu_page, $compat);
 
 $_wp_submenu_nopriv = array();
 $_wp_menu_nopriv    = array();
 // Loop over submenus and remove pages for which the user does not have privs.
-foreach ( $submenu as $parent => $sub ) {
-	foreach ( $sub as $index => $data ) {
-		if ( ! current_user_can( $data[1] ) ) {
-			unset( $submenu[ $parent ][ $index ] );
-			$_wp_submenu_nopriv[ $parent ][ $data[2] ] = true;
+foreach ($submenu as $parent => $sub) {
+	foreach ($sub as $index => $data) {
+		if (!current_user_can($data[1])) {
+			unset($submenu[$parent][$index]);
+			$_wp_submenu_nopriv[$parent][$data[2]] = true;
 		}
 	}
-	unset( $index, $data );
+	unset($index, $data);
 
-	if ( empty( $submenu[ $parent ] ) ) {
-		unset( $submenu[ $parent ] );
+	if (empty($submenu[$parent])) {
+		unset($submenu[$parent]);
 	}
 }
-unset( $sub, $parent );
+unset($sub, $parent);
 
 /*
  * Loop over the top-level menu.
  * Menus for which the original parent is not accessible due to lack of privileges
  * will have the next submenu in line be assigned as the new menu parent.
  */
-foreach ( $menu as $id => $data ) {
-	if ( empty( $submenu[ $data[2] ] ) ) {
+foreach ($menu as $id => $data) {
+	if (empty($submenu[$data[2]])) {
 		continue;
 	}
-	$subs       = $submenu[ $data[2] ];
-	$first_sub  = reset( $subs );
+	$subs       = $submenu[$data[2]];
+	$first_sub  = reset($subs);
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
-		$_wp_real_parent_file[ $old_parent ] = $new_parent;
-		$menu[ $id ][2]                      = $new_parent;
+	if ($new_parent != $old_parent) {
+		$_wp_real_parent_file[$old_parent] = $new_parent;
+		$menu[$id][2]                      = $new_parent;
 
-		foreach ( $submenu[ $old_parent ] as $index => $data ) {
-			$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
-			unset( $submenu[ $old_parent ][ $index ] );
+		foreach ($submenu[$old_parent] as $index => $data) {
+			$submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+			unset($submenu[$old_parent][$index]);
 		}
-		unset( $submenu[ $old_parent ], $index );
+		unset($submenu[$old_parent], $index);
 
-		if ( isset( $_wp_submenu_nopriv[ $old_parent ] ) ) {
-			$_wp_submenu_nopriv[ $new_parent ] = $_wp_submenu_nopriv[ $old_parent ];
+		if (isset($_wp_submenu_nopriv[$old_parent])) {
+			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 		}
 	}
 }
-unset( $id, $data, $subs, $first_sub, $old_parent, $new_parent );
+unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -132,8 +132,8 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'network_admin_menu', '' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_menu', '');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -142,7 +142,7 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'user_admin_menu', '' );
+	do_action('user_admin_menu', '');
 } else {
 
 	/**
@@ -152,39 +152,39 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'admin_menu', '' );
+	do_action('admin_menu', '');
 }
 
 /*
  * Remove menus that have no accessible submenus and require privileges
  * that the user does not have. Run re-parent loop again.
  */
-foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can( $data[1] ) ) {
-		$_wp_menu_nopriv[ $data[2] ] = true;
+foreach ($menu as $id => $data) {
+	if (!current_user_can($data[1])) {
+		$_wp_menu_nopriv[$data[2]] = true;
 	}
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
-		$subs      = $submenu[ $data[2] ];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] ) {
-			unset( $submenu[ $data[2] ] );
+	if (!empty($submenu[$data[2]]) && 1 === count($submenu[$data[2]])) {
+		$subs      = $submenu[$data[2]];
+		$first_sub = reset($subs);
+		if ($data[2] == $first_sub[2]) {
+			unset($submenu[$data[2]]);
 		}
 	}
 
 	// If submenu is empty...
-	if ( empty( $submenu[ $data[2] ] ) ) {
+	if (empty($submenu[$data[2]])) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[ $data[2] ] ) ) {
-			unset( $menu[ $id ] );
+		if (isset($_wp_menu_nopriv[$data[2]])) {
+			unset($menu[$id]);
 		}
 	}
 }
-unset( $id, $data, $subs, $first_sub );
+unset($id, $data, $subs, $first_sub);
 
 /**
  * Adds a CSS class to a string.
@@ -195,8 +195,8 @@ 
  * @param string $classes      The string to add the CSS class to.
  * @return string The string with the CSS class added.
  */
-function add_cssclass( $class_to_add, $classes ) {
-	if ( empty( $classes ) ) {
+function add_cssclass($class_to_add, $classes) {
+	if (empty($classes)) {
 		return $class_to_add;
 	}
 
@@ -213,37 +213,37 @@ 
  * @param array $menu The array of administration menu items.
  * @return array The array of administration menu items with the CSS classes added.
  */
-function add_menu_classes( $menu ) {
+function add_menu_classes($menu) {
 	$first_item  = false;
 	$last_order  = false;
-	$items_count = count( $menu );
+	$items_count = count($menu);
 	$i           = 0;
 
-	foreach ( $menu as $order => $top ) {
+	foreach ($menu as $order => $top) {
 		$i++;
 
-		if ( 0 == $order ) { // Dashboard is always shown/single.
-			$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
+		if (0 == $order) { // Dashboard is always shown/single.
+			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
 			$last_order = 0;
 			continue;
 		}
 
-		if ( 0 === strpos( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
+		if (0 === strpos($top[2], 'separator') && false !== $last_order) { // If separator.
 			$first_item             = true;
-			$classes                = $menu[ $last_order ][4];
-			$menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
+			$classes                = $menu[$last_order][4];
+			$menu[$last_order][4] = add_cssclass('menu-top-last', $classes);
 			continue;
 		}
 
-		if ( $first_item ) {
-			$classes           = $menu[ $order ][4];
-			$menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
+		if ($first_item) {
+			$classes           = $menu[$order][4];
+			$menu[$order][4] = add_cssclass('menu-top-first', $classes);
 			$first_item        = false;
 		}
 
-		if ( $i == $items_count ) { // Last item.
-			$classes           = $menu[ $order ][4];
-			$menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
+		if ($i == $items_count) { // Last item.
+			$classes           = $menu[$order][4];
+			$menu[$order][4] = add_cssclass('menu-top-last', $classes);
 		}
 
 		$last_order = $order;
@@ -256,10 +256,10 @@ 
 	 *
 	 * @param array $menu Associative array of administration menu items.
 	 */
-	return apply_filters( 'add_menu_classes', $menu );
+	return apply_filters('add_menu_classes', $menu);
 }
 
-uksort( $menu, 'strnatcasecmp' ); // Make it all pretty.
+uksort($menu, 'strnatcasecmp'); // Make it all pretty.
 
 /**
  * Filters whether to enable custom ordering of the administration menu.
@@ -270,12 +270,12 @@ 
  *
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
-if ( apply_filters( 'custom_menu_order', false ) ) {
+if (apply_filters('custom_menu_order', false)) {
 	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
+	foreach ($menu as $menu_item) {
 		$menu_order[] = $menu_item[2];
 	}
-	unset( $menu_item );
+	unset($menu_item);
 	$default_menu_order = $menu_order;
 
 	/**
@@ -290,9 +290,9 @@ 
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order         = apply_filters( 'menu_order', $menu_order );
-	$menu_order         = array_flip( $menu_order );
-	$default_menu_order = array_flip( $default_menu_order );
+	$menu_order         = apply_filters('menu_order', $menu_order);
+	$menu_order         = array_flip($menu_order);
+	$default_menu_order = array_flip($default_menu_order);
 
 	/**
 	 * @global array $menu_order
@@ -302,66 +302,66 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function sort_menu( $a, $b ) {
+	function sort_menu($a, $b) {
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
+		if (isset($menu_order[$a]) && !isset($menu_order[$b])) {
 			return -1;
-		} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
+		} elseif (!isset($menu_order[$a]) && isset($menu_order[$b])) {
 			return 1;
-		} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
-			if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
+		} elseif (isset($menu_order[$a]) && isset($menu_order[$b])) {
+			if ($menu_order[$a] == $menu_order[$b]) {
 				return 0;
 			}
-			return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
+			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
-			return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
+			return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
 		}
 	}
 
-	usort( $menu, 'sort_menu' );
-	unset( $menu_order, $default_menu_order );
+	usort($menu, 'sort_menu');
+	unset($menu_order, $default_menu_order);
 }
 
 // Prevent adjacent separators.
 $prev_menu_was_separator = false;
-foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+foreach ($menu as $id => $data) {
+	if (false === stristr($data[4], 'wp-menu-separator')) {
 
 		// This item is not a separator, so falsey the toggler and do nothing.
 		$prev_menu_was_separator = false;
 	} else {
 
 		// The previous item was a separator, so unset this one.
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
+		if (true === $prev_menu_was_separator) {
+			unset($menu[$id]);
 		}
 
 		// This item is a separator, so truthy the toggler and move on.
 		$prev_menu_was_separator = true;
 	}
 }
-unset( $id, $data, $prev_menu_was_separator );
+unset($id, $data, $prev_menu_was_separator);
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_keys( $menu );
-$last_menu_key = array_pop( $last_menu_key );
-if ( ! empty( $menu ) && 'wp-menu-separator' === $menu[ $last_menu_key ][4] ) {
-	unset( $menu[ $last_menu_key ] );
+$last_menu_key = array_keys($menu);
+$last_menu_key = array_pop($last_menu_key);
+if (!empty($menu) && 'wp-menu-separator' === $menu[$last_menu_key][4]) {
+	unset($menu[$last_menu_key]);
 }
-unset( $last_menu_key );
+unset($last_menu_key);
 
-if ( ! user_can_access_admin_page() ) {
+if (!user_can_access_admin_page()) {
 
 	/**
 	 * Fires when access to an admin page is denied.
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'admin_page_access_denied' );
+	do_action('admin_page_access_denied');
 
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
-$menu = add_menu_classes( $menu );
+$menu = add_menu_classes($menu);

brighty/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Indentation +671 added lines, -671 removed lines

@@ -15,675 +15,675 @@
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
-	/**
-	 * @since 2.5.0
-	 * @var ftp
-	 */
-	public $ftp;
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param array $opt
-	 */
-	public function __construct( $opt = '' ) {
-		$this->method = 'ftpsockets';
-		$this->errors = new WP_Error();
-
-		// Check if possible to use ftp functions.
-		if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
-			return;
-		}
-
-		$this->ftp = new ftp();
-
-		if ( empty( $opt['port'] ) ) {
-			$this->options['port'] = 21;
-		} else {
-			$this->options['port'] = (int) $opt['port'];
-		}
-
-		if ( empty( $opt['hostname'] ) ) {
-			$this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
-		} else {
-			$this->options['hostname'] = $opt['hostname'];
-		}
-
-		// Check if the options provided are OK.
-		if ( empty( $opt['username'] ) ) {
-			$this->errors->add( 'empty_username', __( 'FTP username is required' ) );
-		} else {
-			$this->options['username'] = $opt['username'];
-		}
-
-		if ( empty( $opt['password'] ) ) {
-			$this->errors->add( 'empty_password', __( 'FTP password is required' ) );
-		} else {
-			$this->options['password'] = $opt['password'];
-		}
-	}
-
-	/**
-	 * Connects filesystem.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @return bool True on success, false on failure.
-	 */
-	public function connect() {
-		if ( ! $this->ftp ) {
-			return false;
-		}
-
-		$this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
-
-		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
-			$this->errors->add(
-				'connect',
-				sprintf(
-					/* translators: %s: hostname:port */
-					__( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
-				)
-			);
-
-			return false;
-		}
-
-		if ( ! $this->ftp->connect() ) {
-			$this->errors->add(
-				'connect',
-				sprintf(
-					/* translators: %s: hostname:port */
-					__( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
-				)
-			);
-
-			return false;
-		}
-
-		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add(
-				'auth',
-				sprintf(
-					/* translators: %s: Username. */
-					__( 'Username/Password incorrect for %s' ),
-					$this->options['username']
-				)
-			);
-
-			return false;
-		}
-
-		$this->ftp->SetType( FTP_BINARY );
-		$this->ftp->Passive( true );
-		$this->ftp->setTimeout( FS_TIMEOUT );
-
-		return true;
-	}
-
-	/**
-	 * Reads entire file into a string.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Name of the file to read.
-	 * @return string|false Read data on success, false if no temporary file could be opened,
-	 *                      or if the file couldn't be retrieved.
-	 */
-	public function get_contents( $file ) {
-		if ( ! $this->exists( $file ) ) {
-			return false;
-		}
-
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = fopen( $tempfile, 'w+' );
-
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
-			return false;
-		}
-
-		mbstring_binary_safe_encoding();
-
-		if ( ! $this->ftp->fget( $temphandle, $file ) ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
-
-			reset_mbstring_encoding();
-
-			return ''; // Blank document. File does exist, it's just blank.
-		}
-
-		reset_mbstring_encoding();
-
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
-		$contents = '';
-
-		while ( ! feof( $temphandle ) ) {
-			$contents .= fread( $temphandle, 8 * KB_IN_BYTES );
-		}
-
-		fclose( $temphandle );
-		unlink( $tempfile );
-
-		return $contents;
-	}
-
-	/**
-	 * Reads entire file into an array.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to the file.
-	 * @return array|false File contents in an array on success, false on failure.
-	 */
-	public function get_contents_array( $file ) {
-		return explode( "\n", $this->get_contents( $file ) );
-	}
-
-	/**
-	 * Writes a string to a file.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string    $file     Remote path to the file where to write the data.
-	 * @param string    $contents The data to write.
-	 * @param int|false $mode     Optional. The file permissions as octal number, usually 0644.
-	 *                            Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = @fopen( $tempfile, 'w+' );
-
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
-			return false;
-		}
-
-		// The FTP class uses string functions internally during file download/upload.
-		mbstring_binary_safe_encoding();
-
-		$bytes_written = fwrite( $temphandle, $contents );
-
-		if ( false === $bytes_written || strlen( $contents ) !== $bytes_written ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
-
-			reset_mbstring_encoding();
-
-			return false;
-		}
-
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
-
-		$ret = $this->ftp->fput( $file, $temphandle );
-
-		reset_mbstring_encoding();
-
-		fclose( $temphandle );
-		unlink( $tempfile );
-
-		$this->chmod( $file, $mode );
-
-		return $ret;
-	}
-
-	/**
-	 * Gets the current working directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @return string|false The current working directory on success, false on failure.
-	 */
-	public function cwd() {
-		$cwd = $this->ftp->pwd();
-
-		if ( $cwd ) {
-			$cwd = trailingslashit( $cwd );
-		}
-
-		return $cwd;
-	}
-
-	/**
-	 * Changes current directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $dir The new current directory.
-	 * @return bool True on success, false on failure.
-	 */
-	public function chdir( $dir ) {
-		return $this->ftp->chdir( $dir );
-	}
-
-	/**
-	 * Changes filesystem permissions.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string    $file      Path to the file.
-	 * @param int|false $mode      Optional. The permissions as octal number, usually 0644 for files,
-	 *                             0755 for directories. Default false.
-	 * @param bool      $recursive Optional. If set to true, changes file permissions recursively.
-	 *                             Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function chmod( $file, $mode = false, $recursive = false ) {
-		if ( ! $mode ) {
-			if ( $this->is_file( $file ) ) {
-				$mode = FS_CHMOD_FILE;
-			} elseif ( $this->is_dir( $file ) ) {
-				$mode = FS_CHMOD_DIR;
-			} else {
-				return false;
-			}
-		}
-
-		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir( $file ) ) {
-			$filelist = $this->dirlist( $file );
-
-			foreach ( (array) $filelist as $filename => $filemeta ) {
-				$this->chmod( $file . '/' . $filename, $mode, $recursive );
-			}
-		}
-
-		// chmod the file or directory.
-		return $this->ftp->chmod( $file, $mode );
-	}
-
-	/**
-	 * Gets the file owner.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to the file.
-	 * @return string|false Username of the owner on success, false on failure.
-	 */
-	public function owner( $file ) {
-		$dir = $this->dirlist( $file );
-
-		return $dir[ $file ]['owner'];
-	}
-
-	/**
-	 * Gets the permissions of the specified file or filepath in their octal format.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to the file.
-	 * @return string Mode of the file (the last 3 digits).
-	 */
-	public function getchmod( $file ) {
-		$dir = $this->dirlist( $file );
-
-		return $dir[ $file ]['permsn'];
-	}
-
-	/**
-	 * Gets the file's group.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to the file.
-	 * @return string|false The group on success, false on failure.
-	 */
-	public function group( $file ) {
-		$dir = $this->dirlist( $file );
-
-		return $dir[ $file ]['group'];
-	}
-
-	/**
-	 * Copies a file.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string    $source      Path to the source file.
-	 * @param string    $destination Path to the destination file.
-	 * @param bool      $overwrite   Optional. Whether to overwrite the destination file if it exists.
-	 *                               Default false.
-	 * @param int|false $mode        Optional. The permissions as octal number, usually 0644 for files,
-	 *                               0755 for dirs. Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
-		if ( ! $overwrite && $this->exists( $destination ) ) {
-			return false;
-		}
-
-		$content = $this->get_contents( $source );
-
-		if ( false === $content ) {
-			return false;
-		}
-
-		return $this->put_contents( $destination, $content, $mode );
-	}
-
-	/**
-	 * Moves a file.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $source      Path to the source file.
-	 * @param string $destination Path to the destination file.
-	 * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
-	 *                            Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function move( $source, $destination, $overwrite = false ) {
-		return $this->ftp->rename( $source, $destination );
-	}
-
-	/**
-	 * Deletes a file or directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string       $file      Path to the file or directory.
-	 * @param bool         $recursive Optional. If set to true, deletes files and folders recursively.
-	 *                                Default false.
-	 * @param string|false $type      Type of resource. 'f' for file, 'd' for directory.
-	 *                                Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function delete( $file, $recursive = false, $type = false ) {
-		if ( empty( $file ) ) {
-			return false;
-		}
-
-		if ( 'f' === $type || $this->is_file( $file ) ) {
-			return $this->ftp->delete( $file );
-		}
-
-		if ( ! $recursive ) {
-			return $this->ftp->rmdir( $file );
-		}
-
-		return $this->ftp->mdel( $file );
-	}
-
-	/**
-	 * Checks if a file or directory exists.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file or directory.
-	 * @return bool Whether $file exists or not.
-	 */
-	public function exists( $file ) {
-		$list = $this->ftp->nlist( $file );
-
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
-			return true; // File is an empty directory.
-		}
-
-		return ! empty( $list ); // Empty list = no file, so invert.
-		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
-	}
-
-	/**
-	 * Checks if resource is a file.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file File path.
-	 * @return bool Whether $file is a file.
-	 */
-	public function is_file( $file ) {
-		if ( $this->is_dir( $file ) ) {
-			return false;
-		}
-
-		if ( $this->exists( $file ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if resource is a directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $path Directory path.
-	 * @return bool Whether $path is a directory.
-	 */
-	public function is_dir( $path ) {
-		$cwd = $this->cwd();
-
-		if ( $this->chdir( $path ) ) {
-			$this->chdir( $cwd );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if a file is readable.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file.
-	 * @return bool Whether $file is readable.
-	 */
-	public function is_readable( $file ) {
-		return true;
-	}
-
-	/**
-	 * Checks if a file or directory is writable.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file or directory.
-	 * @return bool Whether $file is writable.
-	 */
-	public function is_writable( $file ) {
-		return true;
-	}
-
-	/**
-	 * Gets the file's last access time.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file.
-	 * @return int|false Unix timestamp representing last access time, false on failure.
-	 */
-	public function atime( $file ) {
-		return false;
-	}
-
-	/**
-	 * Gets the file modification time.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file.
-	 * @return int|false Unix timestamp representing modification time, false on failure.
-	 */
-	public function mtime( $file ) {
-		return $this->ftp->mdtm( $file );
-	}
-
-	/**
-	 * Gets the file size (in bytes).
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file Path to file.
-	 * @return int|false Size of the file in bytes on success, false on failure.
-	 */
-	public function size( $file ) {
-		return $this->ftp->filesize( $file );
-	}
-
-	/**
-	 * Sets the access and modification times of a file.
-	 *
-	 * Note: If $file doesn't exist, it will be created.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $file  Path to file.
-	 * @param int    $time  Optional. Modified time to set for file.
-	 *                      Default 0.
-	 * @param int    $atime Optional. Access time to set for file.
-	 *                      Default 0.
-	 * @return bool True on success, false on failure.
-	 */
-	public function touch( $file, $time = 0, $atime = 0 ) {
-		return false;
-	}
-
-	/**
-	 * Creates a directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string           $path  Path for new directory.
-	 * @param int|false        $chmod Optional. The permissions as octal number (or false to skip chmod).
-	 *                                Default false.
-	 * @param string|int|false $chown Optional. A user name or number (or false to skip chown).
-	 *                                Default false.
-	 * @param string|int|false $chgrp Optional. A group name or number (or false to skip chgrp).
-	 *                                Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
-		$path = untrailingslashit( $path );
-
-		if ( empty( $path ) ) {
-			return false;
-		}
-
-		if ( ! $this->ftp->mkdir( $path ) ) {
-			return false;
-		}
-
-		if ( ! $chmod ) {
-			$chmod = FS_CHMOD_DIR;
-		}
-
-		$this->chmod( $path, $chmod );
-
-		return true;
-	}
-
-	/**
-	 * Deletes a directory.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $path      Path to directory.
-	 * @param bool   $recursive Optional. Whether to recursively remove files/directories.
-	 *                          Default false.
-	 * @return bool True on success, false on failure.
-	 */
-	public function rmdir( $path, $recursive = false ) {
-		return $this->delete( $path, $recursive );
-	}
-
-	/**
-	 * Gets details for files in a directory or a specific file.
-	 *
-	 * @since 2.5.0
-	 *
-	 * @param string $path           Path to directory or file.
-	 * @param bool   $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
-	 *                               Default true.
-	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
-	 *                               Default false.
-	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
-	 * }
-	 */
-	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
-		if ( $this->is_file( $path ) ) {
-			$limit_file = basename( $path );
-			$path       = dirname( $path ) . '/';
-		} else {
-			$limit_file = false;
-		}
-
-		mbstring_binary_safe_encoding();
-
-		$list = $this->ftp->dirlist( $path );
-
-		if ( empty( $list ) && ! $this->exists( $path ) ) {
-
-			reset_mbstring_encoding();
-
-			return false;
-		}
-
-		$ret = array();
-
-		foreach ( $list as $struc ) {
-
-			if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
-				continue;
-			}
-
-			if ( ! $include_hidden && '.' === $struc['name'][0] ) {
-				continue;
-			}
-
-			if ( $limit_file && $struc['name'] !== $limit_file ) {
-				continue;
-			}
-
-			if ( 'd' === $struc['type'] ) {
-				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
-				} else {
-					$struc['files'] = array();
-				}
-			}
-
-			// Replace symlinks formatted as "source -> target" with just the source name.
-			if ( $struc['islink'] ) {
-				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
-			}
-
-			// Add the octal representation of the file permissions.
-			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
-
-			$ret[ $struc['name'] ] = $struc;
-		}
-
-		reset_mbstring_encoding();
-
-		return $ret;
-	}
-
-	/**
-	 * Destructor.
-	 *
-	 * @since 2.5.0
-	 */
-	public function __destruct() {
-		$this->ftp->quit();
-	}
+    /**
+     * @since 2.5.0
+     * @var ftp
+     */
+    public $ftp;
+
+    /**
+     * Constructor.
+     *
+     * @since 2.5.0
+     *
+     * @param array $opt
+     */
+    public function __construct( $opt = '' ) {
+        $this->method = 'ftpsockets';
+        $this->errors = new WP_Error();
+
+        // Check if possible to use ftp functions.
+        if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
+            return;
+        }
+
+        $this->ftp = new ftp();
+
+        if ( empty( $opt['port'] ) ) {
+            $this->options['port'] = 21;
+        } else {
+            $this->options['port'] = (int) $opt['port'];
+        }
+
+        if ( empty( $opt['hostname'] ) ) {
+            $this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+        } else {
+            $this->options['hostname'] = $opt['hostname'];
+        }
+
+        // Check if the options provided are OK.
+        if ( empty( $opt['username'] ) ) {
+            $this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+        } else {
+            $this->options['username'] = $opt['username'];
+        }
+
+        if ( empty( $opt['password'] ) ) {
+            $this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+        } else {
+            $this->options['password'] = $opt['password'];
+        }
+    }
+
+    /**
+     * Connects filesystem.
+     *
+     * @since 2.5.0
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function connect() {
+        if ( ! $this->ftp ) {
+            return false;
+        }
+
+        $this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
+
+        if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
+            $this->errors->add(
+                'connect',
+                sprintf(
+                    /* translators: %s: hostname:port */
+                    __( 'Failed to connect to FTP Server %s' ),
+                    $this->options['hostname'] . ':' . $this->options['port']
+                )
+            );
+
+            return false;
+        }
+
+        if ( ! $this->ftp->connect() ) {
+            $this->errors->add(
+                'connect',
+                sprintf(
+                    /* translators: %s: hostname:port */
+                    __( 'Failed to connect to FTP Server %s' ),
+                    $this->options['hostname'] . ':' . $this->options['port']
+                )
+            );
+
+            return false;
+        }
+
+        if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
+            $this->errors->add(
+                'auth',
+                sprintf(
+                    /* translators: %s: Username. */
+                    __( 'Username/Password incorrect for %s' ),
+                    $this->options['username']
+                )
+            );
+
+            return false;
+        }
+
+        $this->ftp->SetType( FTP_BINARY );
+        $this->ftp->Passive( true );
+        $this->ftp->setTimeout( FS_TIMEOUT );
+
+        return true;
+    }
+
+    /**
+     * Reads entire file into a string.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Name of the file to read.
+     * @return string|false Read data on success, false if no temporary file could be opened,
+     *                      or if the file couldn't be retrieved.
+     */
+    public function get_contents( $file ) {
+        if ( ! $this->exists( $file ) ) {
+            return false;
+        }
+
+        $tempfile   = wp_tempnam( $file );
+        $temphandle = fopen( $tempfile, 'w+' );
+
+        if ( ! $temphandle ) {
+            unlink( $tempfile );
+            return false;
+        }
+
+        mbstring_binary_safe_encoding();
+
+        if ( ! $this->ftp->fget( $temphandle, $file ) ) {
+            fclose( $temphandle );
+            unlink( $tempfile );
+
+            reset_mbstring_encoding();
+
+            return ''; // Blank document. File does exist, it's just blank.
+        }
+
+        reset_mbstring_encoding();
+
+        fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+        $contents = '';
+
+        while ( ! feof( $temphandle ) ) {
+            $contents .= fread( $temphandle, 8 * KB_IN_BYTES );
+        }
+
+        fclose( $temphandle );
+        unlink( $tempfile );
+
+        return $contents;
+    }
+
+    /**
+     * Reads entire file into an array.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to the file.
+     * @return array|false File contents in an array on success, false on failure.
+     */
+    public function get_contents_array( $file ) {
+        return explode( "\n", $this->get_contents( $file ) );
+    }
+
+    /**
+     * Writes a string to a file.
+     *
+     * @since 2.5.0
+     *
+     * @param string    $file     Remote path to the file where to write the data.
+     * @param string    $contents The data to write.
+     * @param int|false $mode     Optional. The file permissions as octal number, usually 0644.
+     *                            Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function put_contents( $file, $contents, $mode = false ) {
+        $tempfile   = wp_tempnam( $file );
+        $temphandle = @fopen( $tempfile, 'w+' );
+
+        if ( ! $temphandle ) {
+            unlink( $tempfile );
+            return false;
+        }
+
+        // The FTP class uses string functions internally during file download/upload.
+        mbstring_binary_safe_encoding();
+
+        $bytes_written = fwrite( $temphandle, $contents );
+
+        if ( false === $bytes_written || strlen( $contents ) !== $bytes_written ) {
+            fclose( $temphandle );
+            unlink( $tempfile );
+
+            reset_mbstring_encoding();
+
+            return false;
+        }
+
+        fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+
+        $ret = $this->ftp->fput( $file, $temphandle );
+
+        reset_mbstring_encoding();
+
+        fclose( $temphandle );
+        unlink( $tempfile );
+
+        $this->chmod( $file, $mode );
+
+        return $ret;
+    }
+
+    /**
+     * Gets the current working directory.
+     *
+     * @since 2.5.0
+     *
+     * @return string|false The current working directory on success, false on failure.
+     */
+    public function cwd() {
+        $cwd = $this->ftp->pwd();
+
+        if ( $cwd ) {
+            $cwd = trailingslashit( $cwd );
+        }
+
+        return $cwd;
+    }
+
+    /**
+     * Changes current directory.
+     *
+     * @since 2.5.0
+     *
+     * @param string $dir The new current directory.
+     * @return bool True on success, false on failure.
+     */
+    public function chdir( $dir ) {
+        return $this->ftp->chdir( $dir );
+    }
+
+    /**
+     * Changes filesystem permissions.
+     *
+     * @since 2.5.0
+     *
+     * @param string    $file      Path to the file.
+     * @param int|false $mode      Optional. The permissions as octal number, usually 0644 for files,
+     *                             0755 for directories. Default false.
+     * @param bool      $recursive Optional. If set to true, changes file permissions recursively.
+     *                             Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function chmod( $file, $mode = false, $recursive = false ) {
+        if ( ! $mode ) {
+            if ( $this->is_file( $file ) ) {
+                $mode = FS_CHMOD_FILE;
+            } elseif ( $this->is_dir( $file ) ) {
+                $mode = FS_CHMOD_DIR;
+            } else {
+                return false;
+            }
+        }
+
+        // chmod any sub-objects if recursive.
+        if ( $recursive && $this->is_dir( $file ) ) {
+            $filelist = $this->dirlist( $file );
+
+            foreach ( (array) $filelist as $filename => $filemeta ) {
+                $this->chmod( $file . '/' . $filename, $mode, $recursive );
+            }
+        }
+
+        // chmod the file or directory.
+        return $this->ftp->chmod( $file, $mode );
+    }
+
+    /**
+     * Gets the file owner.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to the file.
+     * @return string|false Username of the owner on success, false on failure.
+     */
+    public function owner( $file ) {
+        $dir = $this->dirlist( $file );
+
+        return $dir[ $file ]['owner'];
+    }
+
+    /**
+     * Gets the permissions of the specified file or filepath in their octal format.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to the file.
+     * @return string Mode of the file (the last 3 digits).
+     */
+    public function getchmod( $file ) {
+        $dir = $this->dirlist( $file );
+
+        return $dir[ $file ]['permsn'];
+    }
+
+    /**
+     * Gets the file's group.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to the file.
+     * @return string|false The group on success, false on failure.
+     */
+    public function group( $file ) {
+        $dir = $this->dirlist( $file );
+
+        return $dir[ $file ]['group'];
+    }
+
+    /**
+     * Copies a file.
+     *
+     * @since 2.5.0
+     *
+     * @param string    $source      Path to the source file.
+     * @param string    $destination Path to the destination file.
+     * @param bool      $overwrite   Optional. Whether to overwrite the destination file if it exists.
+     *                               Default false.
+     * @param int|false $mode        Optional. The permissions as octal number, usually 0644 for files,
+     *                               0755 for dirs. Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+        if ( ! $overwrite && $this->exists( $destination ) ) {
+            return false;
+        }
+
+        $content = $this->get_contents( $source );
+
+        if ( false === $content ) {
+            return false;
+        }
+
+        return $this->put_contents( $destination, $content, $mode );
+    }
+
+    /**
+     * Moves a file.
+     *
+     * @since 2.5.0
+     *
+     * @param string $source      Path to the source file.
+     * @param string $destination Path to the destination file.
+     * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
+     *                            Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function move( $source, $destination, $overwrite = false ) {
+        return $this->ftp->rename( $source, $destination );
+    }
+
+    /**
+     * Deletes a file or directory.
+     *
+     * @since 2.5.0
+     *
+     * @param string       $file      Path to the file or directory.
+     * @param bool         $recursive Optional. If set to true, deletes files and folders recursively.
+     *                                Default false.
+     * @param string|false $type      Type of resource. 'f' for file, 'd' for directory.
+     *                                Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function delete( $file, $recursive = false, $type = false ) {
+        if ( empty( $file ) ) {
+            return false;
+        }
+
+        if ( 'f' === $type || $this->is_file( $file ) ) {
+            return $this->ftp->delete( $file );
+        }
+
+        if ( ! $recursive ) {
+            return $this->ftp->rmdir( $file );
+        }
+
+        return $this->ftp->mdel( $file );
+    }
+
+    /**
+     * Checks if a file or directory exists.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file or directory.
+     * @return bool Whether $file exists or not.
+     */
+    public function exists( $file ) {
+        $list = $this->ftp->nlist( $file );
+
+        if ( empty( $list ) && $this->is_dir( $file ) ) {
+            return true; // File is an empty directory.
+        }
+
+        return ! empty( $list ); // Empty list = no file, so invert.
+        // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
+    }
+
+    /**
+     * Checks if resource is a file.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file File path.
+     * @return bool Whether $file is a file.
+     */
+    public function is_file( $file ) {
+        if ( $this->is_dir( $file ) ) {
+            return false;
+        }
+
+        if ( $this->exists( $file ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if resource is a directory.
+     *
+     * @since 2.5.0
+     *
+     * @param string $path Directory path.
+     * @return bool Whether $path is a directory.
+     */
+    public function is_dir( $path ) {
+        $cwd = $this->cwd();
+
+        if ( $this->chdir( $path ) ) {
+            $this->chdir( $cwd );
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if a file is readable.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file.
+     * @return bool Whether $file is readable.
+     */
+    public function is_readable( $file ) {
+        return true;
+    }
+
+    /**
+     * Checks if a file or directory is writable.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file or directory.
+     * @return bool Whether $file is writable.
+     */
+    public function is_writable( $file ) {
+        return true;
+    }
+
+    /**
+     * Gets the file's last access time.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file.
+     * @return int|false Unix timestamp representing last access time, false on failure.
+     */
+    public function atime( $file ) {
+        return false;
+    }
+
+    /**
+     * Gets the file modification time.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file.
+     * @return int|false Unix timestamp representing modification time, false on failure.
+     */
+    public function mtime( $file ) {
+        return $this->ftp->mdtm( $file );
+    }
+
+    /**
+     * Gets the file size (in bytes).
+     *
+     * @since 2.5.0
+     *
+     * @param string $file Path to file.
+     * @return int|false Size of the file in bytes on success, false on failure.
+     */
+    public function size( $file ) {
+        return $this->ftp->filesize( $file );
+    }
+
+    /**
+     * Sets the access and modification times of a file.
+     *
+     * Note: If $file doesn't exist, it will be created.
+     *
+     * @since 2.5.0
+     *
+     * @param string $file  Path to file.
+     * @param int    $time  Optional. Modified time to set for file.
+     *                      Default 0.
+     * @param int    $atime Optional. Access time to set for file.
+     *                      Default 0.
+     * @return bool True on success, false on failure.
+     */
+    public function touch( $file, $time = 0, $atime = 0 ) {
+        return false;
+    }
+
+    /**
+     * Creates a directory.
+     *
+     * @since 2.5.0
+     *
+     * @param string           $path  Path for new directory.
+     * @param int|false        $chmod Optional. The permissions as octal number (or false to skip chmod).
+     *                                Default false.
+     * @param string|int|false $chown Optional. A user name or number (or false to skip chown).
+     *                                Default false.
+     * @param string|int|false $chgrp Optional. A group name or number (or false to skip chgrp).
+     *                                Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+        $path = untrailingslashit( $path );
+
+        if ( empty( $path ) ) {
+            return false;
+        }
+
+        if ( ! $this->ftp->mkdir( $path ) ) {
+            return false;
+        }
+
+        if ( ! $chmod ) {
+            $chmod = FS_CHMOD_DIR;
+        }
+
+        $this->chmod( $path, $chmod );
+
+        return true;
+    }
+
+    /**
+     * Deletes a directory.
+     *
+     * @since 2.5.0
+     *
+     * @param string $path      Path to directory.
+     * @param bool   $recursive Optional. Whether to recursively remove files/directories.
+     *                          Default false.
+     * @return bool True on success, false on failure.
+     */
+    public function rmdir( $path, $recursive = false ) {
+        return $this->delete( $path, $recursive );
+    }
+
+    /**
+     * Gets details for files in a directory or a specific file.
+     *
+     * @since 2.5.0
+     *
+     * @param string $path           Path to directory or file.
+     * @param bool   $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
+     *                               Default true.
+     * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
+     *                               Default false.
+     * @return array|false {
+     *     Array of files. False if unable to list directory contents.
+     *
+     *     @type string $name        Name of the file or directory.
+     *     @type string $perms       *nix representation of permissions.
+     *     @type string $permsn      Octal representation of permissions.
+     *     @type string $owner       Owner name or ID.
+     *     @type int    $size        Size of file in bytes.
+     *     @type int    $lastmodunix Last modified unix timestamp.
+     *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
+     *     @type int    $time        Last modified time.
+     *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
+     *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+     * }
+     */
+    public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+        if ( $this->is_file( $path ) ) {
+            $limit_file = basename( $path );
+            $path       = dirname( $path ) . '/';
+        } else {
+            $limit_file = false;
+        }
+
+        mbstring_binary_safe_encoding();
+
+        $list = $this->ftp->dirlist( $path );
+
+        if ( empty( $list ) && ! $this->exists( $path ) ) {
+
+            reset_mbstring_encoding();
+
+            return false;
+        }
+
+        $ret = array();
+
+        foreach ( $list as $struc ) {
+
+            if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
+                continue;
+            }
+
+            if ( ! $include_hidden && '.' === $struc['name'][0] ) {
+                continue;
+            }
+
+            if ( $limit_file && $struc['name'] !== $limit_file ) {
+                continue;
+            }
+
+            if ( 'd' === $struc['type'] ) {
+                if ( $recursive ) {
+                    $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+                } else {
+                    $struc['files'] = array();
+                }
+            }
+
+            // Replace symlinks formatted as "source -> target" with just the source name.
+            if ( $struc['islink'] ) {
+                $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+            }
+
+            // Add the octal representation of the file permissions.
+            $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+
+            $ret[ $struc['name'] ] = $struc;
+        }
+
+        reset_mbstring_encoding();
+
+        return $ret;
+    }
+
+    /**
+     * Destructor.
+     *
+     * @since 2.5.0
+     */
+    public function __destruct() {
+        $this->ftp->quit();
+    }
 }

Spacing +129 added lines, -129 removed lines

@@ -28,38 +28,38 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpsockets';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
+		if (!include_once ABSPATH . 'wp-admin/includes/class-ftp.php') {
 			return;
 		}
 
 		$this->ftp = new ftp();
 
-		if ( empty( $opt['port'] ) ) {
+		if (empty($opt['port'])) {
 			$this->options['port'] = 21;
 		} else {
 			$this->options['port'] = (int) $opt['port'];
 		}
 
-		if ( empty( $opt['hostname'] ) ) {
-			$this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+		if (empty($opt['hostname'])) {
+			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		} else {
 			$this->options['hostname'] = $opt['hostname'];
 		}
 
 		// Check if the options provided are OK.
-		if ( empty( $opt['username'] ) ) {
-			$this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+		if (empty($opt['username'])) {
+			$this->errors->add('empty_username', __('FTP username is required'));
 		} else {
 			$this->options['username'] = $opt['username'];
 		}
 
-		if ( empty( $opt['password'] ) ) {
-			$this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+		if (empty($opt['password'])) {
+			$this->errors->add('empty_password', __('FTP password is required'));
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
@@ -73,18 +73,18 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function connect() {
-		if ( ! $this->ftp ) {
+		if (!$this->ftp) {
 			return false;
 		}
 
-		$this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
+		$this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
+		if (!$this->ftp->SetServer($this->options['hostname'], $this->options['port'])) {
 			$this->errors->add(
 				'connect',
 				sprintf(
 					/* translators: %s: hostname:port */
-					__( 'Failed to connect to FTP Server %s' ),
+					__('Failed to connect to FTP Server %s'),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -92,12 +92,12 @@ 
 			return false;
 		}
 
-		if ( ! $this->ftp->connect() ) {
+		if (!$this->ftp->connect()) {
 			$this->errors->add(
 				'connect',
 				sprintf(
 					/* translators: %s: hostname:port */
-					__( 'Failed to connect to FTP Server %s' ),
+					__('Failed to connect to FTP Server %s'),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -105,12 +105,12 @@ 
 			return false;
 		}
 
-		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
+		if (!$this->ftp->login($this->options['username'], $this->options['password'])) {
 			$this->errors->add(
 				'auth',
 				sprintf(
 					/* translators: %s: Username. */
-					__( 'Username/Password incorrect for %s' ),
+					__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
@@ -118,9 +118,9 @@ 
 			return false;
 		}
 
-		$this->ftp->SetType( FTP_BINARY );
-		$this->ftp->Passive( true );
-		$this->ftp->setTimeout( FS_TIMEOUT );
+		$this->ftp->SetType(FTP_BINARY);
+		$this->ftp->Passive(true);
+		$this->ftp->setTimeout(FS_TIMEOUT);
 
 		return true;
 	}
@@ -134,24 +134,24 @@ 
 	 * @return string|false Read data on success, false if no temporary file could be opened,
 	 *                      or if the file couldn't be retrieved.
 	 */
-	public function get_contents( $file ) {
-		if ( ! $this->exists( $file ) ) {
+	public function get_contents($file) {
+		if (!$this->exists($file)) {
 			return false;
 		}
 
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = fopen( $tempfile, 'w+' );
+		$tempfile   = wp_tempnam($file);
+		$temphandle = fopen($tempfile, 'w+');
 
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
+		if (!$temphandle) {
+			unlink($tempfile);
 			return false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		if ( ! $this->ftp->fget( $temphandle, $file ) ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
+		if (!$this->ftp->fget($temphandle, $file)) {
+			fclose($temphandle);
+			unlink($tempfile);
 
 			reset_mbstring_encoding();
 
@@ -160,15 +160,15 @@ 
 
 		reset_mbstring_encoding();
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+		fseek($temphandle, 0); // Skip back to the start of the file being written to.
 		$contents = '';
 
-		while ( ! feof( $temphandle ) ) {
-			$contents .= fread( $temphandle, 8 * KB_IN_BYTES );
+		while (!feof($temphandle)) {
+			$contents .= fread($temphandle, 8 * KB_IN_BYTES);
 		}
 
-		fclose( $temphandle );
-		unlink( $tempfile );
+		fclose($temphandle);
+		unlink($tempfile);
 
 		return $contents;
 	}
@@ -181,8 +181,8 @@ 
 	 * @param string $file Path to the file.
 	 * @return array|false File contents in an array on success, false on failure.
 	 */
-	public function get_contents_array( $file ) {
-		return explode( "\n", $this->get_contents( $file ) );
+	public function get_contents_array($file) {
+		return explode("\n", $this->get_contents($file));
 	}
 
 	/**
@@ -196,39 +196,39 @@ 
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = @fopen( $tempfile, 'w+' );
+	public function put_contents($file, $contents, $mode = false) {
+		$tempfile   = wp_tempnam($file);
+		$temphandle = @fopen($tempfile, 'w+');
 
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
+		if (!$temphandle) {
+			unlink($tempfile);
 			return false;
 		}
 
 		// The FTP class uses string functions internally during file download/upload.
 		mbstring_binary_safe_encoding();
 
-		$bytes_written = fwrite( $temphandle, $contents );
+		$bytes_written = fwrite($temphandle, $contents);
 
-		if ( false === $bytes_written || strlen( $contents ) !== $bytes_written ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
+		if (false === $bytes_written || strlen($contents) !== $bytes_written) {
+			fclose($temphandle);
+			unlink($tempfile);
 
 			reset_mbstring_encoding();
 
 			return false;
 		}
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+		fseek($temphandle, 0); // Skip back to the start of the file being written to.
 
-		$ret = $this->ftp->fput( $file, $temphandle );
+		$ret = $this->ftp->fput($file, $temphandle);
 
 		reset_mbstring_encoding();
 
-		fclose( $temphandle );
-		unlink( $tempfile );
+		fclose($temphandle);
+		unlink($tempfile);
 
-		$this->chmod( $file, $mode );
+		$this->chmod($file, $mode);
 
 		return $ret;
 	}
@@ -243,8 +243,8 @@ 
 	public function cwd() {
 		$cwd = $this->ftp->pwd();
 
-		if ( $cwd ) {
-			$cwd = trailingslashit( $cwd );
+		if ($cwd) {
+			$cwd = trailingslashit($cwd);
 		}
 
 		return $cwd;
@@ -258,8 +258,8 @@ 
 	 * @param string $dir The new current directory.
 	 * @return bool True on success, false on failure.
 	 */
-	public function chdir( $dir ) {
-		return $this->ftp->chdir( $dir );
+	public function chdir($dir) {
+		return $this->ftp->chdir($dir);
 	}
 
 	/**
@@ -274,11 +274,11 @@ 
 	 *                             Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function chmod( $file, $mode = false, $recursive = false ) {
-		if ( ! $mode ) {
-			if ( $this->is_file( $file ) ) {
+	public function chmod($file, $mode = false, $recursive = false) {
+		if (!$mode) {
+			if ($this->is_file($file)) {
 				$mode = FS_CHMOD_FILE;
-			} elseif ( $this->is_dir( $file ) ) {
+			} elseif ($this->is_dir($file)) {
 				$mode = FS_CHMOD_DIR;
 			} else {
 				return false;
@@ -286,16 +286,16 @@ 
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir( $file ) ) {
-			$filelist = $this->dirlist( $file );
+		if ($recursive && $this->is_dir($file)) {
+			$filelist = $this->dirlist($file);
 
-			foreach ( (array) $filelist as $filename => $filemeta ) {
-				$this->chmod( $file . '/' . $filename, $mode, $recursive );
+			foreach ((array) $filelist as $filename => $filemeta) {
+				$this->chmod($file . '/' . $filename, $mode, $recursive);
 			}
 		}
 
 		// chmod the file or directory.
-		return $this->ftp->chmod( $file, $mode );
+		return $this->ftp->chmod($file, $mode);
 	}
 
 	/**
@@ -306,10 +306,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|false Username of the owner on success, false on failure.
 	 */
-	public function owner( $file ) {
-		$dir = $this->dirlist( $file );
+	public function owner($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['owner'];
+		return $dir[$file]['owner'];
 	}
 
 	/**
@@ -320,10 +320,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string Mode of the file (the last 3 digits).
 	 */
-	public function getchmod( $file ) {
-		$dir = $this->dirlist( $file );
+	public function getchmod($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['permsn'];
+		return $dir[$file]['permsn'];
 	}
 
 	/**
@@ -334,10 +334,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|false The group on success, false on failure.
 	 */
-	public function group( $file ) {
-		$dir = $this->dirlist( $file );
+	public function group($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['group'];
+		return $dir[$file]['group'];
 	}
 
 	/**
@@ -353,18 +353,18 @@ 
 	 *                               0755 for dirs. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
-		if ( ! $overwrite && $this->exists( $destination ) ) {
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
+		if (!$overwrite && $this->exists($destination)) {
 			return false;
 		}
 
-		$content = $this->get_contents( $source );
+		$content = $this->get_contents($source);
 
-		if ( false === $content ) {
+		if (false === $content) {
 			return false;
 		}
 
-		return $this->put_contents( $destination, $content, $mode );
+		return $this->put_contents($destination, $content, $mode);
 	}
 
 	/**
@@ -378,8 +378,8 @@ 
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function move( $source, $destination, $overwrite = false ) {
-		return $this->ftp->rename( $source, $destination );
+	public function move($source, $destination, $overwrite = false) {
+		return $this->ftp->rename($source, $destination);
 	}
 
 	/**
@@ -394,20 +394,20 @@ 
 	 *                                Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function delete( $file, $recursive = false, $type = false ) {
-		if ( empty( $file ) ) {
+	public function delete($file, $recursive = false, $type = false) {
+		if (empty($file)) {
 			return false;
 		}
 
-		if ( 'f' === $type || $this->is_file( $file ) ) {
-			return $this->ftp->delete( $file );
+		if ('f' === $type || $this->is_file($file)) {
+			return $this->ftp->delete($file);
 		}
 
-		if ( ! $recursive ) {
-			return $this->ftp->rmdir( $file );
+		if (!$recursive) {
+			return $this->ftp->rmdir($file);
 		}
 
-		return $this->ftp->mdel( $file );
+		return $this->ftp->mdel($file);
 	}
 
 	/**
@@ -418,14 +418,14 @@ 
 	 * @param string $file Path to file or directory.
 	 * @return bool Whether $file exists or not.
 	 */
-	public function exists( $file ) {
-		$list = $this->ftp->nlist( $file );
+	public function exists($file) {
+		$list = $this->ftp->nlist($file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return ! empty( $list ); // Empty list = no file, so invert.
+		return !empty($list); // Empty list = no file, so invert.
 		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	}
 
@@ -437,12 +437,12 @@ 
 	 * @param string $file File path.
 	 * @return bool Whether $file is a file.
 	 */
-	public function is_file( $file ) {
-		if ( $this->is_dir( $file ) ) {
+	public function is_file($file) {
+		if ($this->is_dir($file)) {
 			return false;
 		}
 
-		if ( $this->exists( $file ) ) {
+		if ($this->exists($file)) {
 			return true;
 		}
 
@@ -457,11 +457,11 @@ 
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
-	public function is_dir( $path ) {
+	public function is_dir($path) {
 		$cwd = $this->cwd();
 
-		if ( $this->chdir( $path ) ) {
-			$this->chdir( $cwd );
+		if ($this->chdir($path)) {
+			$this->chdir($cwd);
 			return true;
 		}
 
@@ -476,7 +476,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is readable.
 	 */
-	public function is_readable( $file ) {
+	public function is_readable($file) {
 		return true;
 	}
 
@@ -488,7 +488,7 @@ 
 	 * @param string $file Path to file or directory.
 	 * @return bool Whether $file is writable.
 	 */
-	public function is_writable( $file ) {
+	public function is_writable($file) {
 		return true;
 	}
 
@@ -500,7 +500,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Unix timestamp representing last access time, false on failure.
 	 */
-	public function atime( $file ) {
+	public function atime($file) {
 		return false;
 	}
 
@@ -512,8 +512,8 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Unix timestamp representing modification time, false on failure.
 	 */
-	public function mtime( $file ) {
-		return $this->ftp->mdtm( $file );
+	public function mtime($file) {
+		return $this->ftp->mdtm($file);
 	}
 
 	/**
@@ -524,8 +524,8 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Size of the file in bytes on success, false on failure.
 	 */
-	public function size( $file ) {
-		return $this->ftp->filesize( $file );
+	public function size($file) {
+		return $this->ftp->filesize($file);
 	}
 
 	/**
@@ -542,7 +542,7 @@ 
 	 *                      Default 0.
 	 * @return bool True on success, false on failure.
 	 */
-	public function touch( $file, $time = 0, $atime = 0 ) {
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
@@ -560,22 +560,22 @@ 
 	 *                                Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
-		$path = untrailingslashit( $path );
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+		$path = untrailingslashit($path);
 
-		if ( empty( $path ) ) {
+		if (empty($path)) {
 			return false;
 		}
 
-		if ( ! $this->ftp->mkdir( $path ) ) {
+		if (!$this->ftp->mkdir($path)) {
 			return false;
 		}
 
-		if ( ! $chmod ) {
+		if (!$chmod) {
 			$chmod = FS_CHMOD_DIR;
 		}
 
-		$this->chmod( $path, $chmod );
+		$this->chmod($path, $chmod);
 
 		return true;
 	}
@@ -590,8 +590,8 @@ 
 	 *                          Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function rmdir( $path, $recursive = false ) {
-		return $this->delete( $path, $recursive );
+	public function rmdir($path, $recursive = false) {
+		return $this->delete($path, $recursive);
 	}
 
 	/**
@@ -619,19 +619,19 @@ 
 	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
 	 * }
 	 */
-	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
-		if ( $this->is_file( $path ) ) {
-			$limit_file = basename( $path );
-			$path       = dirname( $path ) . '/';
+	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+		if ($this->is_file($path)) {
+			$limit_file = basename($path);
+			$path       = dirname($path) . '/';
 		} else {
 			$limit_file = false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		$list = $this->ftp->dirlist( $path );
+		$list = $this->ftp->dirlist($path);
 
-		if ( empty( $list ) && ! $this->exists( $path ) ) {
+		if (empty($list) && !$this->exists($path)) {
 
 			reset_mbstring_encoding();
 
@@ -640,37 +640,37 @@ 
 
 		$ret = array();
 
-		foreach ( $list as $struc ) {
+		foreach ($list as $struc) {
 
-			if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
+			if ('.' === $struc['name'] || '..' === $struc['name']) {
 				continue;
 			}
 
-			if ( ! $include_hidden && '.' === $struc['name'][0] ) {
+			if (!$include_hidden && '.' === $struc['name'][0]) {
 				continue;
 			}
 
-			if ( $limit_file && $struc['name'] !== $limit_file ) {
+			if ($limit_file && $struc['name'] !== $limit_file) {
 				continue;
 			}
 
-			if ( 'd' === $struc['type'] ) {
-				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+			if ('d' === $struc['type']) {
+				if ($recursive) {
+					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
 				} else {
 					$struc['files'] = array();
 				}
 			}
 
 			// Replace symlinks formatted as "source -> target" with just the source name.
-			if ( $struc['islink'] ) {
-				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+			if ($struc['islink']) {
+				$struc['name'] = preg_replace('/(\s*->\s*.*)$/', '', $struc['name']);
 			}
 
 			// Add the octal representation of the file permissions.
-			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+			$struc['permsn'] = $this->getnumchmodfromh($struc['perms']);
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 
 		reset_mbstring_encoding();

brighty/wp-admin/includes/class-wp-terms-list-table.php

Indentation +650 added lines, -650 removed lines

@@ -17,639 +17,639 @@ 
  */
 class WP_Terms_List_Table extends WP_List_Table {
 
-	public $callback_args;
-
-	private $level;
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @see WP_List_Table::__construct() for more information on default arguments.
-	 *
-	 * @global string $post_type
-	 * @global string $taxonomy
-	 * @global string $action
-	 * @global object $tax
-	 *
-	 * @param array $args An associative array of arguments.
-	 */
-	public function __construct( $args = array() ) {
-		global $post_type, $taxonomy, $action, $tax;
-
-		parent::__construct(
-			array(
-				'plural'   => 'tags',
-				'singular' => 'tag',
-				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-			)
-		);
-
-		$action    = $this->screen->action;
-		$post_type = $this->screen->post_type;
-		$taxonomy  = $this->screen->taxonomy;
-
-		if ( empty( $taxonomy ) ) {
-			$taxonomy = 'post_tag';
-		}
-
-		if ( ! taxonomy_exists( $taxonomy ) ) {
-			wp_die( __( 'Invalid taxonomy.' ) );
-		}
-
-		$tax = get_taxonomy( $taxonomy );
-
-		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ), true ) ) {
-			$post_type = 'post';
-		}
-
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function ajax_user_can() {
-		return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
-	}
-
-	/**
-	 */
-	public function prepare_items() {
-		$taxonomy = $this->screen->taxonomy;
-
-		$tags_per_page = $this->get_items_per_page( "edit_{$taxonomy}_per_page" );
-
-		if ( 'post_tag' === $taxonomy ) {
-			/**
-			 * Filters the number of terms displayed per page for the Tags list table.
-			 *
-			 * @since 2.8.0
-			 *
-			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
-			 */
-			$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
-
-			/**
-			 * Filters the number of terms displayed per page for the Tags list table.
-			 *
-			 * @since 2.7.0
-			 * @deprecated 2.8.0 Use {@see 'edit_tags_per_page'} instead.
-			 *
-			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
-			 */
-			$tags_per_page = apply_filters_deprecated( 'tagsperpage', array( $tags_per_page ), '2.8.0', 'edit_tags_per_page' );
-		} elseif ( 'category' === $taxonomy ) {
-			/**
-			 * Filters the number of terms displayed per page for the Categories list table.
-			 *
-			 * @since 2.8.0
-			 *
-			 * @param int $tags_per_page Number of categories to be displayed. Default 20.
-			 */
-			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
-		}
-
-		$search = ! empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
-
-		$args = array(
-			'taxonomy'   => $taxonomy,
-			'search'     => $search,
-			'page'       => $this->get_pagenum(),
-			'number'     => $tags_per_page,
-			'hide_empty' => 0,
-		);
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
-		}
-
-		$args['offset'] = ( $args['page'] - 1 ) * $args['number'];
-
-		// Save the values because 'number' and 'offset' can be subsequently overridden.
-		$this->callback_args = $args;
-
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-			// We'll need the full set of terms then.
-			$args['number'] = 0;
-			$args['offset'] = $args['number'];
-		}
-
-		$this->items = get_terms( $args );
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => wp_count_terms(
-					array(
-						'taxonomy' => $taxonomy,
-						'search'   => $search,
-					)
-				),
-				'per_page'    => $tags_per_page,
-			)
-		);
-	}
-
-	/**
-	 */
-	public function no_items() {
-		echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function get_bulk_actions() {
-		$actions = array();
-
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) ) {
-			$actions['delete'] = __( 'Delete' );
-		}
-
-		return $actions;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && 'delete' === $_REQUEST['action'] ) {
-			return 'bulk-delete';
-		}
-
-		return parent::current_action();
-	}
-
-	/**
-	 * @return array
-	 */
-	public function get_columns() {
-		$columns = array(
-			'cb'          => '<input type="checkbox" />',
-			'name'        => _x( 'Name', 'term name' ),
-			'description' => __( 'Description' ),
-			'slug'        => __( 'Slug' ),
-		);
-
-		if ( 'link_category' === $this->screen->taxonomy ) {
-			$columns['links'] = __( 'Links' );
-		} else {
-			$columns['posts'] = _x( 'Count', 'Number/count of items' );
-		}
-
-		return $columns;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function get_sortable_columns() {
-		return array(
-			'name'        => 'name',
-			'description' => 'description',
-			'slug'        => 'slug',
-			'posts'       => 'count',
-			'links'       => 'count',
-		);
-	}
-
-	/**
-	 */
-	public function display_rows_or_placeholder() {
-		$taxonomy = $this->screen->taxonomy;
-
-		$number = $this->callback_args['number'];
-		$offset = $this->callback_args['offset'];
-
-		// Convert it to table rows.
-		$count = 0;
-
-		if ( empty( $this->items ) || ! is_array( $this->items ) ) {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
-			$this->no_items();
-			echo '</td></tr>';
-			return;
-		}
-
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $this->callback_args['orderby'] ) ) {
-			if ( ! empty( $this->callback_args['search'] ) ) {// Ignore children on searches.
-				$children = array();
-			} else {
-				$children = _get_term_hierarchy( $taxonomy );
-			}
-
-			/*
+    public $callback_args;
+
+    private $level;
+
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @global string $post_type
+     * @global string $taxonomy
+     * @global string $action
+     * @global object $tax
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        global $post_type, $taxonomy, $action, $tax;
+
+        parent::__construct(
+            array(
+                'plural'   => 'tags',
+                'singular' => 'tag',
+                'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+            )
+        );
+
+        $action    = $this->screen->action;
+        $post_type = $this->screen->post_type;
+        $taxonomy  = $this->screen->taxonomy;
+
+        if ( empty( $taxonomy ) ) {
+            $taxonomy = 'post_tag';
+        }
+
+        if ( ! taxonomy_exists( $taxonomy ) ) {
+            wp_die( __( 'Invalid taxonomy.' ) );
+        }
+
+        $tax = get_taxonomy( $taxonomy );
+
+        // @todo Still needed? Maybe just the show_ui part.
+        if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ), true ) ) {
+            $post_type = 'post';
+        }
+
+    }
+
+    /**
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
+    }
+
+    /**
+     */
+    public function prepare_items() {
+        $taxonomy = $this->screen->taxonomy;
+
+        $tags_per_page = $this->get_items_per_page( "edit_{$taxonomy}_per_page" );
+
+        if ( 'post_tag' === $taxonomy ) {
+            /**
+             * Filters the number of terms displayed per page for the Tags list table.
+             *
+             * @since 2.8.0
+             *
+             * @param int $tags_per_page Number of tags to be displayed. Default 20.
+             */
+            $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+
+            /**
+             * Filters the number of terms displayed per page for the Tags list table.
+             *
+             * @since 2.7.0
+             * @deprecated 2.8.0 Use {@see 'edit_tags_per_page'} instead.
+             *
+             * @param int $tags_per_page Number of tags to be displayed. Default 20.
+             */
+            $tags_per_page = apply_filters_deprecated( 'tagsperpage', array( $tags_per_page ), '2.8.0', 'edit_tags_per_page' );
+        } elseif ( 'category' === $taxonomy ) {
+            /**
+             * Filters the number of terms displayed per page for the Categories list table.
+             *
+             * @since 2.8.0
+             *
+             * @param int $tags_per_page Number of categories to be displayed. Default 20.
+             */
+            $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
+        }
+
+        $search = ! empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
+
+        $args = array(
+            'taxonomy'   => $taxonomy,
+            'search'     => $search,
+            'page'       => $this->get_pagenum(),
+            'number'     => $tags_per_page,
+            'hide_empty' => 0,
+        );
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            $args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            $args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+        }
+
+        $args['offset'] = ( $args['page'] - 1 ) * $args['number'];
+
+        // Save the values because 'number' and 'offset' can be subsequently overridden.
+        $this->callback_args = $args;
+
+        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+            // We'll need the full set of terms then.
+            $args['number'] = 0;
+            $args['offset'] = $args['number'];
+        }
+
+        $this->items = get_terms( $args );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => wp_count_terms(
+                    array(
+                        'taxonomy' => $taxonomy,
+                        'search'   => $search,
+                    )
+                ),
+                'per_page'    => $tags_per_page,
+            )
+        );
+    }
+
+    /**
+     */
+    public function no_items() {
+        echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
+    }
+
+    /**
+     * @return array
+     */
+    protected function get_bulk_actions() {
+        $actions = array();
+
+        if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) ) {
+            $actions['delete'] = __( 'Delete' );
+        }
+
+        return $actions;
+    }
+
+    /**
+     * @return string
+     */
+    public function current_action() {
+        if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && 'delete' === $_REQUEST['action'] ) {
+            return 'bulk-delete';
+        }
+
+        return parent::current_action();
+    }
+
+    /**
+     * @return array
+     */
+    public function get_columns() {
+        $columns = array(
+            'cb'          => '<input type="checkbox" />',
+            'name'        => _x( 'Name', 'term name' ),
+            'description' => __( 'Description' ),
+            'slug'        => __( 'Slug' ),
+        );
+
+        if ( 'link_category' === $this->screen->taxonomy ) {
+            $columns['links'] = __( 'Links' );
+        } else {
+            $columns['posts'] = _x( 'Count', 'Number/count of items' );
+        }
+
+        return $columns;
+    }
+
+    /**
+     * @return array
+     */
+    protected function get_sortable_columns() {
+        return array(
+            'name'        => 'name',
+            'description' => 'description',
+            'slug'        => 'slug',
+            'posts'       => 'count',
+            'links'       => 'count',
+        );
+    }
+
+    /**
+     */
+    public function display_rows_or_placeholder() {
+        $taxonomy = $this->screen->taxonomy;
+
+        $number = $this->callback_args['number'];
+        $offset = $this->callback_args['offset'];
+
+        // Convert it to table rows.
+        $count = 0;
+
+        if ( empty( $this->items ) || ! is_array( $this->items ) ) {
+            echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+            $this->no_items();
+            echo '</td></tr>';
+            return;
+        }
+
+        if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $this->callback_args['orderby'] ) ) {
+            if ( ! empty( $this->callback_args['search'] ) ) {// Ignore children on searches.
+                $children = array();
+            } else {
+                $children = _get_term_hierarchy( $taxonomy );
+            }
+
+            /*
 			 * Some funky recursion to get the job done (paging & parents mainly) is contained within.
 			 * Skip it for non-hierarchical taxonomies for performance sake.
 			 */
-			$this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count );
-		} else {
-			foreach ( $this->items as $term ) {
-				$this->single_row( $term );
-			}
-		}
-	}
-
-	/**
-	 * @param string $taxonomy
-	 * @param array  $terms
-	 * @param array  $children
-	 * @param int    $start
-	 * @param int    $per_page
-	 * @param int    $count
-	 * @param int    $parent_term
-	 * @param int    $level
-	 */
-	private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent_term = 0, $level = 0 ) {
-
-		$end = $start + $per_page;
-
-		foreach ( $terms as $key => $term ) {
-
-			if ( $count >= $end ) {
-				break;
-			}
-
-			if ( $term->parent !== $parent_term && empty( $_REQUEST['s'] ) ) {
-				continue;
-			}
-
-			// If the page starts in a subtree, print the parents.
-			if ( $count === $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
-				$my_parents = array();
-				$parent_ids = array();
-				$p          = $term->parent;
-
-				while ( $p ) {
-					$my_parent    = get_term( $p, $taxonomy );
-					$my_parents[] = $my_parent;
-					$p            = $my_parent->parent;
-
-					if ( in_array( $p, $parent_ids, true ) ) { // Prevent parent loops.
-						break;
-					}
-
-					$parent_ids[] = $p;
-				}
-
-				unset( $parent_ids );
-
-				$num_parents = count( $my_parents );
-
-				while ( $my_parent = array_pop( $my_parents ) ) {
-					echo "\t";
-					$this->single_row( $my_parent, $level - $num_parents );
-					$num_parents--;
-				}
-			}
-
-			if ( $count >= $start ) {
-				echo "\t";
-				$this->single_row( $term, $level );
-			}
-
-			++$count;
-
-			unset( $terms[ $key ] );
-
-			if ( isset( $children[ $term->term_id ] ) && empty( $_REQUEST['s'] ) ) {
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
-			}
-		}
-	}
-
-	/**
-	 * @global string $taxonomy
-	 * @param WP_Term $tag   Term object.
-	 * @param int     $level
-	 */
-	public function single_row( $tag, $level = 0 ) {
-		global $taxonomy;
-		$tag = sanitize_term( $tag, $taxonomy );
-
-		$this->level = $level;
-
-		if ( $tag->parent ) {
-			$count = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
-			$level = 'level-' . $count;
-		} else {
-			$level = 'level-0';
-		}
-
-		echo '<tr id="tag-' . $tag->term_id . '" class="' . $level . '">';
-		$this->single_row_columns( $tag );
-		echo '</tr>';
-	}
-
-	/**
-	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param WP_Term $item Term object.
-	 * @return string
-	 */
-	public function column_cb( $item ) {
-		// Restores the more descriptive, specific name for use within this method.
-		$tag = $item;
-
-		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
-			return sprintf(
-				'<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .
-				'<input type="checkbox" name="delete_tags[]" value="%1$s" id="cb-select-%1$s" />',
-				$tag->term_id,
-				/* translators: %s: Taxonomy term name. */
-				sprintf( __( 'Select %s' ), $tag->name )
-			);
-		}
-
-		return '&nbsp;';
-	}
-
-	/**
-	 * @param WP_Term $tag Term object.
-	 * @return string
-	 */
-	public function column_name( $tag ) {
-		$taxonomy = $this->screen->taxonomy;
-
-		$pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
-
-		/**
-		 * Filters display of the term name in the terms list table.
-		 *
-		 * The default output may include padding due to the term's
-		 * current level in the term hierarchy.
-		 *
-		 * @since 2.5.0
-		 *
-		 * @see WP_Terms_List_Table::column_name()
-		 *
-		 * @param string $pad_tag_name The term name, padded if not top-level.
-		 * @param WP_Term $tag         Term object.
-		 */
-		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
-
-		$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-
-		$uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
-
-		$edit_link = get_edit_term_link( $tag, $taxonomy, $this->screen->post_type );
-
-		if ( $edit_link ) {
-			$edit_link = add_query_arg(
-				'wp_http_referer',
-				urlencode( wp_unslash( $uri ) ),
-				$edit_link
-			);
-			$name      = sprintf(
-				'<a class="row-title" href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
-				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $tag->name ) ),
-				$name
-			);
-		}
-
-		$out = sprintf(
-			'<strong>%s</strong><br />',
-			$name
-		);
-
-		$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-		$out .= '<div class="name">' . $qe_data->name . '</div>';
-
-		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
-		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
-
-		return $out;
-	}
-
-	/**
-	 * Gets the name of the default primary column.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @return string Name of the default primary column, in this case, 'name'.
-	 */
-	protected function get_default_primary_column_name() {
-		return 'name';
-	}
-
-	/**
-	 * Generates and displays row action links.
-	 *
-	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param WP_Term $item        Tag being acted upon.
-	 * @param string  $column_name Current column name.
-	 * @param string  $primary     Primary column name.
-	 * @return string Row actions output for terms, or an empty string
-	 *                if the current column is not the primary column.
-	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
-			return '';
-		}
-
-		// Restores the more descriptive, specific name for use within this method.
-		$tag      = $item;
-		$taxonomy = $this->screen->taxonomy;
-		$tax      = get_taxonomy( $taxonomy );
-		$uri      = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
-
-		$edit_link = add_query_arg(
-			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
-		);
-
-		$actions = array();
-
-		if ( current_user_can( 'edit_term', $tag->term_id ) ) {
-			$actions['edit'] = sprintf(
-				'<a href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
-				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Edit' )
-			);
-			$actions['inline hide-if-no-js'] = sprintf(
-				'<button type="button" class="button-link editinline" aria-label="%s" aria-expanded="false">%s</button>',
-				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $tag->name ) ),
-				__( 'Quick&nbsp;Edit' )
-			);
-		}
-
-		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
-			$actions['delete'] = sprintf(
-				'<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
-				wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
-				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Delete &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Delete' )
-			);
-		}
-
-		if ( is_taxonomy_viewable( $tax ) ) {
-			$actions['view'] = sprintf(
-				'<a href="%s" aria-label="%s">%s</a>',
-				get_term_link( $tag ),
-				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221; archive' ), $tag->name ) ),
-				__( 'View' )
-			);
-		}
-
-		/**
-		 * Filters the action links displayed for each term in the Tags list table.
-		 *
-		 * @since 2.8.0
-		 * @since 3.0.0 Deprecated in favor of {@see '{$taxonomy}_row_actions'} filter.
-		 * @since 5.4.2 Restored (un-deprecated).
-		 *
-		 * @param string[] $actions An array of action links to be displayed. Default
-		 *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
-		 * @param WP_Term  $tag     Term object.
-		 */
-		$actions = apply_filters( 'tag_row_actions', $actions, $tag );
-
-		/**
-		 * Filters the action links displayed for each term in the terms list table.
-		 *
-		 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
-		 *
-		 * Possible hook names include:
-		 *
-		 *  - `category_row_actions`
-		 *  - `post_tag_row_actions`
-		 *
-		 * @since 3.0.0
-		 *
-		 * @param string[] $actions An array of action links to be displayed. Default
-		 *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
-		 * @param WP_Term  $tag     Term object.
-		 */
-		$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
-
-		return $this->row_actions( $actions );
-	}
-
-	/**
-	 * @param WP_Term $tag Term object.
-	 * @return string
-	 */
-	public function column_description( $tag ) {
-		if ( $tag->description ) {
-			return $tag->description;
-		} else {
-			return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . __( 'No description' ) . '</span>';
-		}
-	}
-
-	/**
-	 * @param WP_Term $tag Term object.
-	 * @return string
-	 */
-	public function column_slug( $tag ) {
-		/** This filter is documented in wp-admin/edit-tag-form.php */
-		return apply_filters( 'editable_slug', $tag->slug, $tag );
-	}
-
-	/**
-	 * @param WP_Term $tag Term object.
-	 * @return string
-	 */
-	public function column_posts( $tag ) {
-		$count = number_format_i18n( $tag->count );
-
-		$tax = get_taxonomy( $this->screen->taxonomy );
-
-		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui ) {
-			return $count;
-		}
-
-		if ( $tax->query_var ) {
-			$args = array( $tax->query_var => $tag->slug );
-		} else {
-			$args = array(
-				'taxonomy' => $tax->name,
-				'term'     => $tag->slug,
-			);
-		}
-
-		if ( 'post' !== $this->screen->post_type ) {
-			$args['post_type'] = $this->screen->post_type;
-		}
-
-		if ( 'attachment' === $this->screen->post_type ) {
-			return "<a href='" . esc_url( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
-		}
-
-		return "<a href='" . esc_url( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
-	}
-
-	/**
-	 * @param WP_Term $tag Term object.
-	 * @return string
-	 */
-	public function column_links( $tag ) {
-		$count = number_format_i18n( $tag->count );
-
-		if ( $count ) {
-			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
-		}
-
-		return $count;
-	}
-
-	/**
-	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
-	 *
-	 * @param WP_Term $item        Term object.
-	 * @param string  $column_name Name of the column.
-	 * @return string
-	 */
-	public function column_default( $item, $column_name ) {
-		/**
-		 * Filters the displayed columns in the terms list table.
-		 *
-		 * The dynamic portion of the hook name, `$this->screen->taxonomy`,
-		 * refers to the slug of the current taxonomy.
-		 *
-		 * Possible hook names include:
-		 *
-		 *  - `manage_category_custom_column`
-		 *  - `manage_post_tag_custom_column`
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param string $string      Custom column output. Default empty.
-		 * @param string $column_name Name of the column.
-		 * @param int    $term_id     Term ID.
-		 */
-		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $item->term_id );
-	}
-
-	/**
-	 * Outputs the hidden row displayed when inline editing
-	 *
-	 * @since 3.1.0
-	 */
-	public function inline_edit() {
-		$tax = get_taxonomy( $this->screen->taxonomy );
-
-		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
-			return;
-		}
-		?>
+            $this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count );
+        } else {
+            foreach ( $this->items as $term ) {
+                $this->single_row( $term );
+            }
+        }
+    }
+
+    /**
+     * @param string $taxonomy
+     * @param array  $terms
+     * @param array  $children
+     * @param int    $start
+     * @param int    $per_page
+     * @param int    $count
+     * @param int    $parent_term
+     * @param int    $level
+     */
+    private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent_term = 0, $level = 0 ) {
+
+        $end = $start + $per_page;
+
+        foreach ( $terms as $key => $term ) {
+
+            if ( $count >= $end ) {
+                break;
+            }
+
+            if ( $term->parent !== $parent_term && empty( $_REQUEST['s'] ) ) {
+                continue;
+            }
+
+            // If the page starts in a subtree, print the parents.
+            if ( $count === $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
+                $my_parents = array();
+                $parent_ids = array();
+                $p          = $term->parent;
+
+                while ( $p ) {
+                    $my_parent    = get_term( $p, $taxonomy );
+                    $my_parents[] = $my_parent;
+                    $p            = $my_parent->parent;
+
+                    if ( in_array( $p, $parent_ids, true ) ) { // Prevent parent loops.
+                        break;
+                    }
+
+                    $parent_ids[] = $p;
+                }
+
+                unset( $parent_ids );
+
+                $num_parents = count( $my_parents );
+
+                while ( $my_parent = array_pop( $my_parents ) ) {
+                    echo "\t";
+                    $this->single_row( $my_parent, $level - $num_parents );
+                    $num_parents--;
+                }
+            }
+
+            if ( $count >= $start ) {
+                echo "\t";
+                $this->single_row( $term, $level );
+            }
+
+            ++$count;
+
+            unset( $terms[ $key ] );
+
+            if ( isset( $children[ $term->term_id ] ) && empty( $_REQUEST['s'] ) ) {
+                $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+            }
+        }
+    }
+
+    /**
+     * @global string $taxonomy
+     * @param WP_Term $tag   Term object.
+     * @param int     $level
+     */
+    public function single_row( $tag, $level = 0 ) {
+        global $taxonomy;
+        $tag = sanitize_term( $tag, $taxonomy );
+
+        $this->level = $level;
+
+        if ( $tag->parent ) {
+            $count = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
+            $level = 'level-' . $count;
+        } else {
+            $level = 'level-0';
+        }
+
+        echo '<tr id="tag-' . $tag->term_id . '" class="' . $level . '">';
+        $this->single_row_columns( $tag );
+        echo '</tr>';
+    }
+
+    /**
+     * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param WP_Term $item Term object.
+     * @return string
+     */
+    public function column_cb( $item ) {
+        // Restores the more descriptive, specific name for use within this method.
+        $tag = $item;
+
+        if ( current_user_can( 'delete_term', $tag->term_id ) ) {
+            return sprintf(
+                '<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .
+                '<input type="checkbox" name="delete_tags[]" value="%1$s" id="cb-select-%1$s" />',
+                $tag->term_id,
+                /* translators: %s: Taxonomy term name. */
+                sprintf( __( 'Select %s' ), $tag->name )
+            );
+        }
+
+        return '&nbsp;';
+    }
+
+    /**
+     * @param WP_Term $tag Term object.
+     * @return string
+     */
+    public function column_name( $tag ) {
+        $taxonomy = $this->screen->taxonomy;
+
+        $pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
+
+        /**
+         * Filters display of the term name in the terms list table.
+         *
+         * The default output may include padding due to the term's
+         * current level in the term hierarchy.
+         *
+         * @since 2.5.0
+         *
+         * @see WP_Terms_List_Table::column_name()
+         *
+         * @param string $pad_tag_name The term name, padded if not top-level.
+         * @param WP_Term $tag         Term object.
+         */
+        $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+
+        $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
+
+        $uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+        $edit_link = get_edit_term_link( $tag, $taxonomy, $this->screen->post_type );
+
+        if ( $edit_link ) {
+            $edit_link = add_query_arg(
+                'wp_http_referer',
+                urlencode( wp_unslash( $uri ) ),
+                $edit_link
+            );
+            $name      = sprintf(
+                '<a class="row-title" href="%s" aria-label="%s">%s</a>',
+                esc_url( $edit_link ),
+                /* translators: %s: Taxonomy term name. */
+                esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $tag->name ) ),
+                $name
+            );
+        }
+
+        $out = sprintf(
+            '<strong>%s</strong><br />',
+            $name
+        );
+
+        $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
+        $out .= '<div class="name">' . $qe_data->name . '</div>';
+
+        /** This filter is documented in wp-admin/edit-tag-form.php */
+        $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
+        $out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+
+        return $out;
+    }
+
+    /**
+     * Gets the name of the default primary column.
+     *
+     * @since 4.3.0
+     *
+     * @return string Name of the default primary column, in this case, 'name'.
+     */
+    protected function get_default_primary_column_name() {
+        return 'name';
+    }
+
+    /**
+     * Generates and displays row action links.
+     *
+     * @since 4.3.0
+     * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param WP_Term $item        Tag being acted upon.
+     * @param string  $column_name Current column name.
+     * @param string  $primary     Primary column name.
+     * @return string Row actions output for terms, or an empty string
+     *                if the current column is not the primary column.
+     */
+    protected function handle_row_actions( $item, $column_name, $primary ) {
+        if ( $primary !== $column_name ) {
+            return '';
+        }
+
+        // Restores the more descriptive, specific name for use within this method.
+        $tag      = $item;
+        $taxonomy = $this->screen->taxonomy;
+        $tax      = get_taxonomy( $taxonomy );
+        $uri      = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+        $edit_link = add_query_arg(
+            'wp_http_referer',
+            urlencode( wp_unslash( $uri ) ),
+            get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
+        );
+
+        $actions = array();
+
+        if ( current_user_can( 'edit_term', $tag->term_id ) ) {
+            $actions['edit'] = sprintf(
+                '<a href="%s" aria-label="%s">%s</a>',
+                esc_url( $edit_link ),
+                /* translators: %s: Taxonomy term name. */
+                esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $tag->name ) ),
+                __( 'Edit' )
+            );
+            $actions['inline hide-if-no-js'] = sprintf(
+                '<button type="button" class="button-link editinline" aria-label="%s" aria-expanded="false">%s</button>',
+                /* translators: %s: Taxonomy term name. */
+                esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $tag->name ) ),
+                __( 'Quick&nbsp;Edit' )
+            );
+        }
+
+        if ( current_user_can( 'delete_term', $tag->term_id ) ) {
+            $actions['delete'] = sprintf(
+                '<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
+                wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+                /* translators: %s: Taxonomy term name. */
+                esc_attr( sprintf( __( 'Delete &#8220;%s&#8221;' ), $tag->name ) ),
+                __( 'Delete' )
+            );
+        }
+
+        if ( is_taxonomy_viewable( $tax ) ) {
+            $actions['view'] = sprintf(
+                '<a href="%s" aria-label="%s">%s</a>',
+                get_term_link( $tag ),
+                /* translators: %s: Taxonomy term name. */
+                esc_attr( sprintf( __( 'View &#8220;%s&#8221; archive' ), $tag->name ) ),
+                __( 'View' )
+            );
+        }
+
+        /**
+         * Filters the action links displayed for each term in the Tags list table.
+         *
+         * @since 2.8.0
+         * @since 3.0.0 Deprecated in favor of {@see '{$taxonomy}_row_actions'} filter.
+         * @since 5.4.2 Restored (un-deprecated).
+         *
+         * @param string[] $actions An array of action links to be displayed. Default
+         *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
+         * @param WP_Term  $tag     Term object.
+         */
+        $actions = apply_filters( 'tag_row_actions', $actions, $tag );
+
+        /**
+         * Filters the action links displayed for each term in the terms list table.
+         *
+         * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+         *
+         * Possible hook names include:
+         *
+         *  - `category_row_actions`
+         *  - `post_tag_row_actions`
+         *
+         * @since 3.0.0
+         *
+         * @param string[] $actions An array of action links to be displayed. Default
+         *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
+         * @param WP_Term  $tag     Term object.
+         */
+        $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
+
+        return $this->row_actions( $actions );
+    }
+
+    /**
+     * @param WP_Term $tag Term object.
+     * @return string
+     */
+    public function column_description( $tag ) {
+        if ( $tag->description ) {
+            return $tag->description;
+        } else {
+            return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . __( 'No description' ) . '</span>';
+        }
+    }
+
+    /**
+     * @param WP_Term $tag Term object.
+     * @return string
+     */
+    public function column_slug( $tag ) {
+        /** This filter is documented in wp-admin/edit-tag-form.php */
+        return apply_filters( 'editable_slug', $tag->slug, $tag );
+    }
+
+    /**
+     * @param WP_Term $tag Term object.
+     * @return string
+     */
+    public function column_posts( $tag ) {
+        $count = number_format_i18n( $tag->count );
+
+        $tax = get_taxonomy( $this->screen->taxonomy );
+
+        $ptype_object = get_post_type_object( $this->screen->post_type );
+        if ( ! $ptype_object->show_ui ) {
+            return $count;
+        }
+
+        if ( $tax->query_var ) {
+            $args = array( $tax->query_var => $tag->slug );
+        } else {
+            $args = array(
+                'taxonomy' => $tax->name,
+                'term'     => $tag->slug,
+            );
+        }
+
+        if ( 'post' !== $this->screen->post_type ) {
+            $args['post_type'] = $this->screen->post_type;
+        }
+
+        if ( 'attachment' === $this->screen->post_type ) {
+            return "<a href='" . esc_url( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+        }
+
+        return "<a href='" . esc_url( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
+    }
+
+    /**
+     * @param WP_Term $tag Term object.
+     * @return string
+     */
+    public function column_links( $tag ) {
+        $count = number_format_i18n( $tag->count );
+
+        if ( $count ) {
+            $count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+        }
+
+        return $count;
+    }
+
+    /**
+     * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
+     *
+     * @param WP_Term $item        Term object.
+     * @param string  $column_name Name of the column.
+     * @return string
+     */
+    public function column_default( $item, $column_name ) {
+        /**
+         * Filters the displayed columns in the terms list table.
+         *
+         * The dynamic portion of the hook name, `$this->screen->taxonomy`,
+         * refers to the slug of the current taxonomy.
+         *
+         * Possible hook names include:
+         *
+         *  - `manage_category_custom_column`
+         *  - `manage_post_tag_custom_column`
+         *
+         * @since 2.8.0
+         *
+         * @param string $string      Custom column output. Default empty.
+         * @param string $column_name Name of the column.
+         * @param int    $term_id     Term ID.
+         */
+        return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $item->term_id );
+    }
+
+    /**
+     * Outputs the hidden row displayed when inline editing
+     *
+     * @since 3.1.0
+     */
+    public function inline_edit() {
+        $tax = get_taxonomy( $this->screen->taxonomy );
+
+        if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+            return;
+        }
+        ?>
 
 		<form method="get">
 		<table style="display: none"><tbody id="inlineedit">
@@ -676,25 +676,25 @@ 
 			</fieldset>
 
 			<?php
-			$core_columns = array(
-				'cb'          => true,
-				'description' => true,
-				'name'        => true,
-				'slug'        => true,
-				'posts'       => true,
-			);
-
-			list( $columns ) = $this->get_column_info();
-
-			foreach ( $columns as $column_name => $column_display_name ) {
-				if ( isset( $core_columns[ $column_name ] ) ) {
-					continue;
-				}
-
-				/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-				do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
-			}
-			?>
+            $core_columns = array(
+                'cb'          => true,
+                'description' => true,
+                'name'        => true,
+                'slug'        => true,
+                'posts'       => true,
+            );
+
+            list( $columns ) = $this->get_column_info();
+
+            foreach ( $columns as $column_name => $column_display_name ) {
+                if ( isset( $core_columns[ $column_name ] ) ) {
+                    continue;
+                }
+
+                /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+                do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
+            }
+            ?>
 
 			<div class="inline-edit-save submit">
 				<button type="button" class="save button button-primary"><?php echo $tax->labels->update_item; ?></button>
@@ -716,5 +716,5 @@ 
 		</tbody></table>
 		</form>
 		<?php
-	}
+    }
 }

Spacing +132 added lines, -132 removed lines

@@ -35,14 +35,14 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type, $taxonomy, $action, $tax;
 
 		parent::__construct(
 			array(
 				'plural'   => 'tags',
 				'singular' => 'tag',
-				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen'   => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
 
@@ -50,18 +50,18 @@ 
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) ) {
+		if (empty($taxonomy)) {
 			$taxonomy = 'post_tag';
 		}
 
-		if ( ! taxonomy_exists( $taxonomy ) ) {
-			wp_die( __( 'Invalid taxonomy.' ) );
+		if (!taxonomy_exists($taxonomy)) {
+			wp_die(__('Invalid taxonomy.'));
 		}
 
-		$tax = get_taxonomy( $taxonomy );
+		$tax = get_taxonomy($taxonomy);
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ), true ) ) {
+		if (empty($post_type) || !in_array($post_type, get_post_types(array('show_ui' => true)), true)) {
 			$post_type = 'post';
 		}
 
@@ -71,7 +71,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
+		return current_user_can(get_taxonomy($this->screen->taxonomy)->cap->manage_terms);
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	public function prepare_items() {
 		$taxonomy = $this->screen->taxonomy;
 
-		$tags_per_page = $this->get_items_per_page( "edit_{$taxonomy}_per_page" );
+		$tags_per_page = $this->get_items_per_page("edit_{$taxonomy}_per_page");
 
-		if ( 'post_tag' === $taxonomy ) {
+		if ('post_tag' === $taxonomy) {
 			/**
 			 * Filters the number of terms displayed per page for the Tags list table.
 			 *
@@ -89,7 +89,7 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_tags_per_page', $tags_per_page);
 
 			/**
 			 * Filters the number of terms displayed per page for the Tags list table.
@@ -99,8 +99,8 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters_deprecated( 'tagsperpage', array( $tags_per_page ), '2.8.0', 'edit_tags_per_page' );
-		} elseif ( 'category' === $taxonomy ) {
+			$tags_per_page = apply_filters_deprecated('tagsperpage', array($tags_per_page), '2.8.0', 'edit_tags_per_page');
+		} elseif ('category' === $taxonomy) {
 			/**
 			 * Filters the number of terms displayed per page for the Categories list table.
 			 *
@@ -108,10 +108,10 @@ 
 			 *
 			 * @param int $tags_per_page Number of categories to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_categories_per_page', $tags_per_page);
 		}
 
-		$search = ! empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
+		$search = !empty($_REQUEST['s']) ? trim(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'taxonomy'   => $taxonomy,
@@ -121,26 +121,26 @@ 
 			'hide_empty' => 0,
 		);
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		if (!empty($_REQUEST['orderby'])) {
+			$args['orderby'] = trim(wp_unslash($_REQUEST['orderby']));
 		}
 
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		if (!empty($_REQUEST['order'])) {
+			$args['order'] = trim(wp_unslash($_REQUEST['order']));
 		}
 
-		$args['offset'] = ( $args['page'] - 1 ) * $args['number'];
+		$args['offset'] = ($args['page'] - 1) * $args['number'];
 
 		// Save the values because 'number' and 'offset' can be subsequently overridden.
 		$this->callback_args = $args;
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+		if (is_taxonomy_hierarchical($taxonomy) && !isset($args['orderby'])) {
 			// We'll need the full set of terms then.
 			$args['number'] = 0;
 			$args['offset'] = $args['number'];
 		}
 
-		$this->items = get_terms( $args );
+		$this->items = get_terms($args);
 
 		$this->set_pagination_args(
 			array(
@@ -158,7 +158,7 @@ 
 	/**
 	 */
 	public function no_items() {
-		echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
+		echo get_taxonomy($this->screen->taxonomy)->labels->not_found;
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) ) {
-			$actions['delete'] = __( 'Delete' );
+		if (current_user_can(get_taxonomy($this->screen->taxonomy)->cap->delete_terms)) {
+			$actions['delete'] = __('Delete');
 		}
 
 		return $actions;
@@ -178,7 +178,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && 'delete' === $_REQUEST['action'] ) {
+		if (isset($_REQUEST['action']) && isset($_REQUEST['delete_tags']) && 'delete' === $_REQUEST['action']) {
 			return 'bulk-delete';
 		}
 
@@ -191,15 +191,15 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => _x( 'Name', 'term name' ),
-			'description' => __( 'Description' ),
-			'slug'        => __( 'Slug' ),
+			'name'        => _x('Name', 'term name'),
+			'description' => __('Description'),
+			'slug'        => __('Slug'),
 		);
 
-		if ( 'link_category' === $this->screen->taxonomy ) {
-			$columns['links'] = __( 'Links' );
+		if ('link_category' === $this->screen->taxonomy) {
+			$columns['links'] = __('Links');
 		} else {
-			$columns['posts'] = _x( 'Count', 'Number/count of items' );
+			$columns['posts'] = _x('Count', 'Number/count of items');
 		}
 
 		return $columns;
@@ -229,28 +229,28 @@ 
 		// Convert it to table rows.
 		$count = 0;
 
-		if ( empty( $this->items ) || ! is_array( $this->items ) ) {
+		if (empty($this->items) || !is_array($this->items)) {
 			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
 			$this->no_items();
 			echo '</td></tr>';
 			return;
 		}
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $this->callback_args['orderby'] ) ) {
-			if ( ! empty( $this->callback_args['search'] ) ) {// Ignore children on searches.
+		if (is_taxonomy_hierarchical($taxonomy) && !isset($this->callback_args['orderby'])) {
+			if (!empty($this->callback_args['search'])) {// Ignore children on searches.
 				$children = array();
 			} else {
-				$children = _get_term_hierarchy( $taxonomy );
+				$children = _get_term_hierarchy($taxonomy);
 			}
 
 			/*
 			 * Some funky recursion to get the job done (paging & parents mainly) is contained within.
 			 * Skip it for non-hierarchical taxonomies for performance sake.
 			 */
-			$this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count );
+			$this->_rows($taxonomy, $this->items, $children, $offset, $number, $count);
 		} else {
-			foreach ( $this->items as $term ) {
-				$this->single_row( $term );
+			foreach ($this->items as $term) {
+				$this->single_row($term);
 			}
 		}
 	}
@@ -265,60 +265,60 @@ 
 	 * @param int    $parent_term
 	 * @param int    $level
 	 */
-	private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent_term = 0, $level = 0 ) {
+	private function _rows($taxonomy, $terms, &$children, $start, $per_page, &$count, $parent_term = 0, $level = 0) {
 
 		$end = $start + $per_page;
 
-		foreach ( $terms as $key => $term ) {
+		foreach ($terms as $key => $term) {
 
-			if ( $count >= $end ) {
+			if ($count >= $end) {
 				break;
 			}
 
-			if ( $term->parent !== $parent_term && empty( $_REQUEST['s'] ) ) {
+			if ($term->parent !== $parent_term && empty($_REQUEST['s'])) {
 				continue;
 			}
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count === $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
+			if ($count === $start && $term->parent > 0 && empty($_REQUEST['s'])) {
 				$my_parents = array();
 				$parent_ids = array();
 				$p          = $term->parent;
 
-				while ( $p ) {
-					$my_parent    = get_term( $p, $taxonomy );
+				while ($p) {
+					$my_parent    = get_term($p, $taxonomy);
 					$my_parents[] = $my_parent;
 					$p            = $my_parent->parent;
 
-					if ( in_array( $p, $parent_ids, true ) ) { // Prevent parent loops.
+					if (in_array($p, $parent_ids, true)) { // Prevent parent loops.
 						break;
 					}
 
 					$parent_ids[] = $p;
 				}
 
-				unset( $parent_ids );
+				unset($parent_ids);
 
-				$num_parents = count( $my_parents );
+				$num_parents = count($my_parents);
 
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				while ($my_parent = array_pop($my_parents)) {
 					echo "\t";
-					$this->single_row( $my_parent, $level - $num_parents );
+					$this->single_row($my_parent, $level - $num_parents);
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				echo "\t";
-				$this->single_row( $term, $level );
+				$this->single_row($term, $level);
 			}
 
 			++$count;
 
-			unset( $terms[ $key ] );
+			unset($terms[$key]);
 
-			if ( isset( $children[ $term->term_id ] ) && empty( $_REQUEST['s'] ) ) {
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			if (isset($children[$term->term_id]) && empty($_REQUEST['s'])) {
+				$this->_rows($taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1);
 			}
 		}
 	}
@@ -328,21 +328,21 @@ 
 	 * @param WP_Term $tag   Term object.
 	 * @param int     $level
 	 */
-	public function single_row( $tag, $level = 0 ) {
+	public function single_row($tag, $level = 0) {
 		global $taxonomy;
-		$tag = sanitize_term( $tag, $taxonomy );
+		$tag = sanitize_term($tag, $taxonomy);
 
 		$this->level = $level;
 
-		if ( $tag->parent ) {
-			$count = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
+		if ($tag->parent) {
+			$count = count(get_ancestors($tag->term_id, $taxonomy, 'taxonomy'));
 			$level = 'level-' . $count;
 		} else {
 			$level = 'level-0';
 		}
 
 		echo '<tr id="tag-' . $tag->term_id . '" class="' . $level . '">';
-		$this->single_row_columns( $tag );
+		$this->single_row_columns($tag);
 		echo '</tr>';
 	}
 
@@ -352,17 +352,17 @@ 
 	 * @param WP_Term $item Term object.
 	 * @return string
 	 */
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		// Restores the more descriptive, specific name for use within this method.
 		$tag = $item;
 
-		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
+		if (current_user_can('delete_term', $tag->term_id)) {
 			return sprintf(
 				'<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .
 				'<input type="checkbox" name="delete_tags[]" value="%1$s" id="cb-select-%1$s" />',
 				$tag->term_id,
 				/* translators: %s: Taxonomy term name. */
-				sprintf( __( 'Select %s' ), $tag->name )
+				sprintf(__('Select %s'), $tag->name)
 			);
 		}
 
@@ -373,10 +373,10 @@ 
 	 * @param WP_Term $tag Term object.
 	 * @return string
 	 */
-	public function column_name( $tag ) {
+	public function column_name($tag) {
 		$taxonomy = $this->screen->taxonomy;
 
-		$pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
+		$pad = str_repeat('&#8212; ', max(0, $this->level));
 
 		/**
 		 * Filters display of the term name in the terms list table.
@@ -391,25 +391,25 @@ 
 		 * @param string $pad_tag_name The term name, padded if not top-level.
 		 * @param WP_Term $tag         Term object.
 		 */
-		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+		$name = apply_filters('term_name', $pad . ' ' . $tag->name, $tag);
 
-		$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
+		$qe_data = get_term($tag->term_id, $taxonomy, OBJECT, 'edit');
 
 		$uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
-		$edit_link = get_edit_term_link( $tag, $taxonomy, $this->screen->post_type );
+		$edit_link = get_edit_term_link($tag, $taxonomy, $this->screen->post_type);
 
-		if ( $edit_link ) {
+		if ($edit_link) {
 			$edit_link = add_query_arg(
 				'wp_http_referer',
-				urlencode( wp_unslash( $uri ) ),
+				urlencode(wp_unslash($uri)),
 				$edit_link
 			);
-			$name      = sprintf(
+			$name = sprintf(
 				'<a class="row-title" href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
+				esc_url($edit_link),
 				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $tag->name ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $tag->name)),
 				$name
 			);
 		}
@@ -423,7 +423,7 @@ 
 		$out .= '<div class="name">' . $qe_data->name . '</div>';
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
+		$out .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug, $qe_data) . '</div>';
 		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
 
 		return $out;
@@ -452,58 +452,58 @@ 
 	 * @return string Row actions output for terms, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($item, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		// Restores the more descriptive, specific name for use within this method.
 		$tag      = $item;
 		$taxonomy = $this->screen->taxonomy;
-		$tax      = get_taxonomy( $taxonomy );
+		$tax      = get_taxonomy($taxonomy);
 		$uri      = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
+			urlencode(wp_unslash($uri)),
+			get_edit_term_link($tag, $taxonomy, $this->screen->post_type)
 		);
 
 		$actions = array();
 
-		if ( current_user_can( 'edit_term', $tag->term_id ) ) {
+		if (current_user_can('edit_term', $tag->term_id)) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
+				esc_url($edit_link),
 				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $tag->name)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<button type="button" class="button-link editinline" aria-label="%s" aria-expanded="false">%s</button>',
 				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $tag->name ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $tag->name)),
+				__('Quick&nbsp;Edit')
 			);
 		}
 
-		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
+		if (current_user_can('delete_term', $tag->term_id)) {
 			$actions['delete'] = sprintf(
 				'<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
-				wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+				wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id),
 				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'Delete &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Delete' )
+				esc_attr(sprintf(__('Delete &#8220;%s&#8221;'), $tag->name)),
+				__('Delete')
 			);
 		}
 
-		if ( is_taxonomy_viewable( $tax ) ) {
+		if (is_taxonomy_viewable($tax)) {
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_term_link( $tag ),
+				get_term_link($tag),
 				/* translators: %s: Taxonomy term name. */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221; archive' ), $tag->name ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221; archive'), $tag->name)),
+				__('View')
 			);
 		}
 
@@ -518,7 +518,7 @@ 
 		 *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param WP_Term  $tag     Term object.
 		 */
-		$actions = apply_filters( 'tag_row_actions', $actions, $tag );
+		$actions = apply_filters('tag_row_actions', $actions, $tag);
 
 		/**
 		 * Filters the action links displayed for each term in the terms list table.
@@ -536,20 +536,20 @@ 
 		 *                          'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param WP_Term  $tag     Term object.
 		 */
-		$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
+		$actions = apply_filters("{$taxonomy}_row_actions", $actions, $tag);
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
 	 * @param WP_Term $tag Term object.
 	 * @return string
 	 */
-	public function column_description( $tag ) {
-		if ( $tag->description ) {
+	public function column_description($tag) {
+		if ($tag->description) {
 			return $tag->description;
 		} else {
-			return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . __( 'No description' ) . '</span>';
+			return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . __('No description') . '</span>';
 		}
 	}
 
@@ -557,27 +557,27 @@ 
 	 * @param WP_Term $tag Term object.
 	 * @return string
 	 */
-	public function column_slug( $tag ) {
+	public function column_slug($tag) {
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		return apply_filters( 'editable_slug', $tag->slug, $tag );
+		return apply_filters('editable_slug', $tag->slug, $tag);
 	}
 
 	/**
 	 * @param WP_Term $tag Term object.
 	 * @return string
 	 */
-	public function column_posts( $tag ) {
-		$count = number_format_i18n( $tag->count );
+	public function column_posts($tag) {
+		$count = number_format_i18n($tag->count);
 
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui ) {
+		$ptype_object = get_post_type_object($this->screen->post_type);
+		if (!$ptype_object->show_ui) {
 			return $count;
 		}
 
-		if ( $tax->query_var ) {
-			$args = array( $tax->query_var => $tag->slug );
+		if ($tax->query_var) {
+			$args = array($tax->query_var => $tag->slug);
 		} else {
 			$args = array(
 				'taxonomy' => $tax->name,
@@ -585,25 +585,25 @@ 
 			);
 		}
 
-		if ( 'post' !== $this->screen->post_type ) {
+		if ('post' !== $this->screen->post_type) {
 			$args['post_type'] = $this->screen->post_type;
 		}
 
-		if ( 'attachment' === $this->screen->post_type ) {
-			return "<a href='" . esc_url( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ('attachment' === $this->screen->post_type) {
+			return "<a href='" . esc_url(add_query_arg($args, 'upload.php')) . "'>$count</a>";
 		}
 
-		return "<a href='" . esc_url( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
+		return "<a href='" . esc_url(add_query_arg($args, 'edit.php')) . "'>$count</a>";
 	}
 
 	/**
 	 * @param WP_Term $tag Term object.
 	 * @return string
 	 */
-	public function column_links( $tag ) {
-		$count = number_format_i18n( $tag->count );
+	public function column_links($tag) {
+		$count = number_format_i18n($tag->count);
 
-		if ( $count ) {
+		if ($count) {
 			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
 		}
 
@@ -617,7 +617,7 @@ 
 	 * @param string  $column_name Name of the column.
 	 * @return string
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Filters the displayed columns in the terms list table.
 		 *
@@ -635,7 +635,7 @@ 
 		 * @param string $column_name Name of the column.
 		 * @param int    $term_id     Term ID.
 		 */
-		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $item->term_id );
+		return apply_filters("manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $item->term_id);
 	}
 
 	/**
@@ -644,9 +644,9 @@ 
 	 * @since 3.1.0
 	 */
 	public function inline_edit() {
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+		if (!current_user_can($tax->cap->edit_terms)) {
 			return;
 		}
 		?>
@@ -659,16 +659,16 @@ 
 			<div class="inline-edit-wrapper">
 
 			<fieldset>
-				<legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>
+				<legend class="inline-edit-legend"><?php _e('Quick Edit'); ?></legend>
 				<div class="inline-edit-col">
 				<label>
-					<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
+					<span class="title"><?php _ex('Name', 'term name'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
 				</label>
 
-				<?php if ( ! global_terms_enabled() ) : ?>
+				<?php if (!global_terms_enabled()) : ?>
 					<label>
-						<span class="title"><?php _e( 'Slug' ); ?></span>
+						<span class="title"><?php _e('Slug'); ?></span>
 						<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
 					</label>
 				<?php endif; ?>
@@ -684,26 +684,26 @@ 
 				'posts'       => true,
 			);
 
-			list( $columns ) = $this->get_column_info();
+			list($columns) = $this->get_column_info();
 
-			foreach ( $columns as $column_name => $column_display_name ) {
-				if ( isset( $core_columns[ $column_name ] ) ) {
+			foreach ($columns as $column_name => $column_display_name) {
+				if (isset($core_columns[$column_name])) {
 					continue;
 				}
 
 				/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-				do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
+				do_action('quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy);
 			}
 			?>
 
 			<div class="inline-edit-save submit">
 				<button type="button" class="save button button-primary"><?php echo $tax->labels->update_item; ?></button>
-				<button type="button" class="cancel button"><?php _e( 'Cancel' ); ?></button>
+				<button type="button" class="cancel button"><?php _e('Cancel'); ?></button>
 				<span class="spinner"></span>
 
-				<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-				<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
-				<input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
+				<?php wp_nonce_field('taxinlineeditnonce', '_inline_edit', false); ?>
+				<input type="hidden" name="taxonomy" value="<?php echo esc_attr($this->screen->taxonomy); ?>" />
+				<input type="hidden" name="post_type" value="<?php echo esc_attr($this->screen->post_type); ?>" />
 
 				<div class="notice notice-error notice-alt inline hidden">
 					<p class="error"></p>