enmi-conf.org: comparison wp/wp-admin/includes/misc.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	}
 	$markerdata = explode( "\n", implode( '', file( $filename ) ) );
 	$state = false;
 	foreach ( $markerdata as $markerline ) {
 		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
 			$state = false;
 		}
 		if ( $state ) {
 			if ( '#' === substr( $markerline, 0, 1 ) ) {
 				continue;
 			}
 			$result[] = $markerline;
 		}
 		if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
 			$state = true;
 		}
 	}
 			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;
 		),
 		$marker
 	);
 	$instructions = explode( "\n", $instructions );
 	foreach ( $instructions as $line => $text ) {
 		$instructions[ $line ] = '# ' . $text;
 	}
 	/**
 	$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 {
 	);
 	// 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;
 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
 *
 * @return bool|null True on write success, false on failure. Null in multisite.
 */
 function save_mod_rewrite_rules() {
+	global $wp_rewrite;
 	if ( is_multisite() ) {
 		return;
 	}
-	global $wp_rewrite;
 	// Ensure get_home_path() is declared.
 	require_once ABSPATH . 'wp-admin/includes/file.php';
 	$home_path     = get_home_path();
 	/*
 	 * 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() );
 			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
 		}
 	}
 	return false;
 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
 *
 * @return bool|null True on write success, false on failure. Null in multisite.
 */
 function iis7_save_url_rewrite_rules() {
+	global $wp_rewrite;
 	if ( is_multisite() ) {
 		return;
 	}
-	global $wp_rewrite;
 	// 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';
 	// 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 );
 		if ( ! empty( $rule ) ) {
 			return iis7_add_rewrite_rule( $web_config_file, $rule );
 		} else {
 			return iis7_delete_rewrite_rule( $web_config_file );
 		}
 	}
 	return false;
 }
 /**
-* Update the "recently-edited" file for the plugin or theme editor.
+* Updates the "recently-edited" file for the plugin or theme file editor.
 *
 * @since 1.5.0
 *
 * @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 );
 }
 /**
-* Makes a tree structure for the theme editor's file list.
+* Makes a tree structure for the theme file editor's file list.
 *
 * @since 4.9.0
 * @access private
 *
 * @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 ) {
 	$tree_list = array();
 	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 ];
 		}
 		$last_dir = $file_name;
 	}
 	return $tree_list;
 }
 /**
-* Outputs the formatted file list for the theme editor.
+* Outputs the formatted file list for the theme file editor.
 *
 * @since 4.9.0
 * @access private
 *
 * @global string $relative_file Name of the file being edited relative to the
 	global $relative_file, $stylesheet;
 	if ( is_array( $tree ) ) {
 		$index = 0;
 		$size  = count( $tree );
 		foreach ( $tree as $label => $theme_file ) :
 			$index++;
 			if ( ! is_array( $theme_file ) ) {
 				wp_print_theme_file_tree( $theme_file, $level, $index, $size );
 				continue;
 			}
 			?>
 				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 ) );
 				if ( $file_description !== $filename && wp_basename( $filename ) !== $file_description ) {
 					$file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
 				}
 				if ( $relative_file === $filename ) {
 		<?php
 	}
 }
 /**
-* Makes a tree structure for the plugin editor's file list.
+* Makes a tree structure for the plugin file editor's file list.
 *
 * @since 4.9.0
 * @access private
 *
 * @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 ) {
 	$tree_list = array();
 	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 ];
 		}
 		$last_dir = $plugin_file;
 	}
 	return $tree_list;
 }
 /**
-* Outputs the formatted file list for the plugin editor.
+* Outputs the formatted file list for the plugin file editor.
 *
 * @since 4.9.0
 * @access private
 *
 * @param array|string $tree  List of file/folder paths, or filename.
 * @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 ) {
 	global $file, $plugin;
 	if ( is_array( $tree ) ) {
 		$index = 0;
 		$size  = count( $tree );
 		foreach ( $tree as $label => $plugin_file ) :
 			$index++;
 			if ( ! is_array( $plugin_file ) ) {
 				wp_print_plugin_file_tree( $plugin_file, $label, $level, $index, $size );
 				continue;
 			}
 			?>
 	}
 }
 /**
-* Resets global variables based on $_GET and $_POST
+* Resets global variables based on $_GET and $_POST.
 *
 * This function resets global variables based on the names passed
 * in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
 * if neither is defined.
 *
 			$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();
 }
 	$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 ( 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] )
+				|| ( 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];
 		}
 	}
 	$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;
 }
 * Saves option for number of rows when listing posts, pages, comments, etc.
 *
 * @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' );
+	}
-		$user = wp_get_current_user();
+	check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
-		if ( ! $user ) {
-			return;
+	$user = wp_get_current_user();
-		}
-		$option = $_POST['wp_screen_options']['option'];
+	if ( ! $user ) {
-		$value  = $_POST['wp_screen_options']['value'];
+		return;
+	}
-		if ( sanitize_key( $option ) != $option ) {
-			return;
+	$option = $_POST['wp_screen_options']['option'];
-		}
+	$value  = $_POST['wp_screen_options']['value'];
-		$map_option = $option;
+	if ( sanitize_key( $option ) !== $option ) {
-		$type       = str_replace( 'edit_', '', $map_option );
+		return;
-		$type       = str_replace( '_per_page', '', $type );
+	}
-		if ( in_array( $type, get_taxonomies(), true ) ) {
-			$map_option = 'edit_tags_per_page';
+	$map_option = $option;
-		} elseif ( in_array( $type, get_post_types(), true ) ) {
+	$type       = str_replace( 'edit_', '', $map_option );
-			$map_option = 'edit_per_page';
+	$type       = str_replace( '_per_page', '', $type );
-		} else {
-			$option = str_replace( '-', '_', $option );
+	if ( in_array( $type, get_taxonomies(), true ) ) {
-		}
+		$map_option = 'edit_tags_per_page';
+	} elseif ( in_array( $type, get_post_types(), true ) ) {
-		switch ( $map_option ) {
+		$map_option = 'edit_per_page';
-			case 'edit_per_page':
+	} else {
-			case 'users_per_page':
+		$option = str_replace( '-', '_', $option );
-			case 'edit_comments_per_page':
+	}
-			case 'upload_per_page':
-			case 'edit_tags_per_page':
+	switch ( $map_option ) {
-			case 'plugins_per_page':
+		case 'edit_per_page':
-			case 'export_personal_data_requests_per_page':
+		case 'users_per_page':
-			case 'remove_personal_data_requests_per_page':
+		case 'edit_comments_per_page':
-				// Network admin.
+		case 'upload_per_page':
-			case 'sites_network_per_page':
+		case 'edit_tags_per_page':
-			case 'users_network_per_page':
+		case 'plugins_per_page':
-			case 'site_users_network_per_page':
+		case 'export_personal_data_requests_per_page':
-			case 'plugins_network_per_page':
+		case 'remove_personal_data_requests_per_page':
-			case 'themes_network_per_page':
+			// Network admin.
-			case 'site_themes_network_per_page':
+		case 'sites_network_per_page':
-				$value = (int) $value;
+		case 'users_network_per_page':
-				if ( $value < 1 || $value > 999 ) {
+		case 'site_users_network_per_page':
-					return;
+		case 'plugins_network_per_page':
-				}
+		case 'themes_network_per_page':
-				break;
+		case 'site_themes_network_per_page':
-			default:
+			$value = (int) $value;
-				$screen_option = false;
+			if ( $value < 1 || $value > 999 ) {
-				if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+				return;
-					/**
+			}
-					 * Filters a screen option value before it is set.
-					 *
+			break;
-					 * 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.
+		default:
-					 *
+			$screen_option = false;
-					 * Returning false from the filter will skip saving the current option.
-					 *
+			if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $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, `$option`, refers to the option name.
+				 * 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 5.4.2
+				 * @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.
+				 * @param mixed  $screen_option The value to save instead of the option value.
-				 *                               Default false (to skip saving the current option).
+				 *                              Default false (to skip saving the current option).
-				 * @param string  $option        The option name.
+				 * @param string $option        The option name.
-				 * @param int     $value         The option value.
+				 * @param int    $value         The option value.
 				 */
-				$value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
+				$screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+			}
-				if ( false === $value ) {
-					return;
+			/**
-				}
+			 * Filters a screen option value before it is set.
-				break;
+			 *
-		}
+			 * The dynamic portion of the hook name, `$option`, refers to the option name.
+			 *
-		update_user_meta( $user->ID, $option, $value );
+			 * Returning false from the filter will skip saving the current option.
+			 *
-		$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
+			 * @since 5.4.2
-		if ( isset( $_POST['mode'] ) ) {
+			 *
-			$url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+			 * @see set_screen_options()
-		}
+			 *
+			 * @param mixed   $screen_option The value to save instead of the option value.
-		wp_safe_redirect( $url );
+			 *                               Default false (to skip saving the current option).
-		exit;
+			 * @param string  $option        The option name.
-	}
+			 * @param int     $value         The option value.
-}
+			 */
+			$value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
-/**
-* Check if rewrite rule for WordPress already exists in the IIS 7+ configuration file
+			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;
+}
+/**
+* Checks if rewrite rule for WordPress already exists in the IIS 7+ configuration file.
 *
 * @since 2.8.0
 *
+* @param string $filename The file path to the configuration file.
 * @return bool
-* @param string $filename The file path to the configuration file
 */
 function iis7_rewrite_rule_exists( $filename ) {
 	if ( ! file_exists( $filename ) ) {
 		return false;
 	}
 	if ( ! class_exists( 'DOMDocument', false ) ) {
 		return false;
 	}
 	$doc = new DOMDocument();
 	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 ( 0 == $rules->length ) {
+	if ( 0 === $rules->length ) {
 		return false;
-	} else {
+	}
-		return true;
-	}
+	return true;
 }
 /**
-* Delete WordPress rewrite rule from web.config file if it exists there
+* Deletes WordPress rewrite rule from web.config file if it exists there.
 *
 * @since 2.8.0
 *
-* @param string $filename Name of the configuration file
+* @param string $filename Name of the configuration file.
 * @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 ) ) {
 	$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;
 }
 /**
-* Add WordPress rewrite rule to the IIS 7+ configuration file.
+* Adds WordPress rewrite rule to the IIS 7+ configuration file.
 *
 * @since 2.8.0
 *
-* @param string $filename The file path to the configuration file
+* @param string $filename     The file path to the configuration file.
-* @param string $rewrite_rule The XML fragment with URL Rewrite rule
+* @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 ) ) {
 		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.
-	$xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
+	$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
-	if ( $xmlnodes->length > 0 ) {
-		$rules_node = $xmlnodes->item( 0 );
+	if ( $xml_nodes->length > 0 ) {
+		$rules_node = $xml_nodes->item( 0 );
 	} else {
 		$rules_node = $doc->createElement( 'rules' );
-		$xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite' );
+		$xml_nodes = $xpath->query( '/configuration/system.webServer/rewrite' );
-		if ( $xmlnodes->length > 0 ) {
-			$rewrite_node = $xmlnodes->item( 0 );
+		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 );
-			$xmlnodes = $xpath->query( '/configuration/system.webServer' );
+			$xml_nodes = $xpath->query( '/configuration/system.webServer' );
-			if ( $xmlnodes->length > 0 ) {
-				$system_webServer_node = $xmlnodes->item( 0 );
+			if ( $xml_nodes->length > 0 ) {
-				$system_webServer_node->appendChild( $rewrite_node );
+				$system_web_server_node = $xml_nodes->item( 0 );
+				$system_web_server_node->appendChild( $rewrite_node );
 			} else {
-				$system_webServer_node = $doc->createElement( 'system.webServer' );
+				$system_web_server_node = $doc->createElement( 'system.webServer' );
-				$system_webServer_node->appendChild( $rewrite_node );
+				$system_web_server_node->appendChild( $rewrite_node );
-				$xmlnodes = $xpath->query( '/configuration' );
+				$xml_nodes = $xpath->query( '/configuration' );
-				if ( $xmlnodes->length > 0 ) {
-					$config_node = $xmlnodes->item( 0 );
+				if ( $xml_nodes->length > 0 ) {
-					$config_node->appendChild( $system_webServer_node );
+					$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_webServer_node );
+					$config_node->appendChild( $system_web_server_node );
 				}
 			}
 		}
 	}
 	return true;
 }
 /**
-* Saves the XML document into a file
+* Saves the XML document into a file.
 *
 * @since 2.8.0
 *
 * @param DOMDocument $doc
 * @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 );
-	$fp     = fopen( $filename, 'w' );
+	$fp = fopen( $filename, 'w' );
 	fwrite( $fp, $config );
 	fclose( $fp );
 }
 /**
-* Display the default admin color scheme picker (Used in user-edit.php)
+* Displays the default admin color scheme picker (Used in user-edit.php).
 *
 * @since 3.0.0
 *
 * @global array $_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 ) :
 			?>
-			<div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
+			<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 ) {
 						?>
 						<td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
 						<?php
 					}
 					?>
 					</tr>
 				</table>
 			</div>
 			<?php
 		endforeach;
 		?>
 	</fieldset>
 	<?php
 }
 function _customizer_mobile_viewport_meta( $viewport_meta ) {
 	return trim( $viewport_meta, ',' ) . ',minimum-scale=0.5,maximum-scale=1.2';
 }
 /**
-* Check lock status for posts displayed on the Posts screen
+* Checks lock status for posts displayed on the Posts screen.
 *
 * @since 3.6.0
 *
 * @param array  $response  The Heartbeat response.
 * @param array  $data      The $_POST data sent.
 	$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 ( ! $post_id ) {
 				continue;
 			}
 			$user_id = wp_check_post_lock( $post_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 ( get_option( 'show_avatars' ) ) {
 	return $response;
 }
 /**
-* Check lock status on the New/Edit Post screen and refresh the lock
+* Checks lock status on the New/Edit Post screen and refresh the lock.
 *
 * @since 3.6.0
 *
 * @param array  $response  The Heartbeat response.
 * @param array  $data      The $_POST data sent.
 	if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
 		$received = $data['wp-refresh-post-lock'];
 		$send     = array();
 		$post_id = absint( $received['post_id'] );
 		if ( ! $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 );
 		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' ) ) {
 			}
 			$send['lock_error'] = $error;
 		} else {
 			$new_lock = wp_set_post_lock( $post_id );
 			if ( $new_lock ) {
 				$send['new_lock'] = implode( ':', $new_lock );
 			}
 		}
 	return $response;
 }
 /**
-* Check nonce expiration on the New/Edit Post screen and refresh if needed
+* Checks nonce expiration on the New/Edit Post screen and refresh if needed.
 *
 * @since 3.6.0
 *
 * @param array  $response  The Heartbeat response.
 * @param array  $data      The $_POST data sent.
 * @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 ) ) {
-		$received                           = $data['wp-refresh-post-nonces'];
+		$received = $data['wp-refresh-post-nonces'];
 		$response['wp-refresh-post-nonces'] = array( 'check' => 1 );
 		$post_id = absint( $received['post_id'] );
 		if ( ! $post_id ) {
 			return $response;
 		}
 		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 	return $response;
 }
 /**
-* Add the latest Heartbeat and REST-API nonce to the Heartbeat response.
+* Adds the latest Heartbeat and REST-API nonce to the Heartbeat response.
 *
 * @since 5.0.0
 *
 * @param array $response The Heartbeat response.
 * @return array The Heartbeat response.
 	// 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' );
 	return $response;
 }
 /**
-* Disable suspension of Heartbeat on the Add/Edit Post screens.
+* Disables suspension of Heartbeat on the Add/Edit Post screens.
 *
 * @since 3.8.0
 *
-* @global string $pagenow
+* @global string $pagenow The filename of the current screen.
 *
 * @param array $settings An array of Heartbeat settings.
 * @return array Filtered Heartbeat settings.
 */
 function wp_heartbeat_set_suspension( $settings ) {
 	return $settings;
 }
 /**
-* Autosave with heartbeat
+* Performs autosave with heartbeat.
 *
 * @since 3.9.0
 *
 * @param array $response The Heartbeat response.
 * @param array $data     The $_POST data sent.
 	return $response;
 }
 /**
-* Remove single-use URL parameters and create canonical link based on new URL.
+* Removes single-use URL parameters and create canonical link based on new URL.
 *
-* Remove specific query string parameters from a URL, create the canonical link,
+* Removes specific query string parameters from a URL, create the canonical link,
 * put it in the admin header, and change the current URL to match.
 *
 * @since 4.2.0
 */
 function wp_admin_canonical_url() {
 	</script>
 	<?php
 }
 /**
-* Send a referrer policy header so referrers are not sent externally from administration screens.
+* Sends a referrer policy header so referrers are not sent externally from administration screens.
 *
 * @since 4.9.0
 */
 function wp_admin_headers() {
 	$policy = 'strict-origin-when-cross-origin';
 	</script>
 	<?php
 }
 /**
-* Send a confirmation request email when a change of site admin email address is attempted.
+* Sends a confirmation request email when a change of site admin email address is attempted.
 *
 * The new site admin address will not become active until confirmed.
 *
 * @since 3.0.0
 * @since 4.9.0 This function was moved from wp-admin/includes/ms.php so it's no longer Multisite specific.
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
 		'Howdy ###USERNAME###,
-You recently requested to have the administration email address on
+Someone with administrator capabilities recently requested to have the
-your site changed.
+administration email address changed on this site:
+###SITEURL###
-If this is correct, please click on the following link to change it:
+To confirm this change, please click on the following link:
 ###ADMIN_URL###
 You can safely ignore and delete this email if you do not want to
 take this action.
 	$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' ),
-			wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
+			$site_title
 		),
 		$content
 	);
 	if ( $switched_locale ) {
 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 );

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6