site_iri: comparison web/wp-includes/functions.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 * Main WordPress API
 *
 * @package WordPress
 */
-/**
+require( ABSPATH . WPINC . '/option.php' );
-* Converts MySQL DATETIME field to user specified date format.
-*
+/**
-* If $dateformatstring has 'G' value, then gmmktime() function will be used to
+* Converts given date string into a different format.
-* make the time. If $dateformatstring is set to 'U', then mktime() function
+*
-* will be used to make the time.
+* $format should be either a PHP date format string, e.g. 'U' for a Unix
-*
+* timestamp, or 'G' for a Unix timestamp assuming that $date is GMT.
-* The $translate will only be used, if it is set to true and it is by default
+*
-* and if the $wp_locale object has the month and weekday set.
+* If $translate is true then the given date and format string will
+* be passed to date_i18n() for translation.
 *
 * @since 0.71
 *
-* @param string $dateformatstring Either 'G', 'U', or php date format.
+* @param string $format Format of the date to return.
-* @param string $mysqlstring Time from mysql DATETIME field.
+* @param string $date Date string to convert.
-* @param bool $translate Optional. Default is true. Will switch format to locale.
+* @param bool $translate Whether the return date should be translated. Default is true.
-* @return string Date formated by $dateformatstring or locale (if available).
+* @return string|int Formatted date string, or Unix timestamp.
 */
-function mysql2date( $dateformatstring, $mysqlstring, $translate = true ) {
+function mysql2date( $format, $date, $translate = true ) {
-	global $wp_locale;
+	if ( empty( $date ) )
-	$m = $mysqlstring;
-	if ( empty( $m ) )
 		return false;
-	if( 'G' == $dateformatstring ) {
+	if ( 'G' == $format )
-		return strtotime( $m . ' +0000' );
+		return strtotime( $date . ' +0000' );
-	}
+	$i = strtotime( $date );
-	$i = strtotime( $m );
+	if ( 'U' == $format )
-	if( 'U' == $dateformatstring )
 		return $i;
-	if ( $translate)
+	if ( $translate )
-	    return date_i18n( $dateformatstring, $i );
+		return date_i18n( $format, $i );
 	else
-	    return date( $dateformatstring, $i );
+		return date( $format, $i );
 }
 /**
 * Retrieve the current time based on specified type.
 *
 * @return string The date, translated if locale specifies it.
 */
 function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
 	global $wp_locale;
 	$i = $unixtimestamp;
-	// Sanity check for PHP 5.1.0-
-	if ( false === $i || intval($i) < 0 ) {
+	if ( false === $i ) {
 		if ( ! $gmt )
 			$i = current_time( 'timestamp' );
 		else
 			$i = time();
 		// we should not let date() interfere with our
 		$dateformatstring = preg_replace( "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring );
 		$dateformatstring = preg_replace( "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
 		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
 	}
+	$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
+	$timezone_formats_re = implode( '|', $timezone_formats );
+	if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
+		$timezone_string = get_option( 'timezone_string' );
+		if ( $timezone_string ) {
+			$timezone_object = timezone_open( $timezone_string );
+			$date_object = date_create( null, $timezone_object );
+			foreach( $timezone_formats as $timezone_format ) {
+				if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
+					$formatted = date_format( $date_object, $timezone_format );
+					$dateformatstring = ' '.$dateformatstring;
+					$dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
+					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+				}
+			}
+		}
+	}
 	$j = @$datefunc( $dateformatstring, $i );
 	// allow plugins to redo this entirely for languages with untypical grammars
 	$j = apply_filters('date_i18n', $j, $req_format, $i, $gmt);
 	return $j;
 }
 /**
-* Convert number to format based on the locale.
+* Convert integer number to format based on the locale.
 *
 * @since 2.3.0
 *
-* @param mixed $number The number to convert based on locale.
+* @param int $number The number to convert based on locale.
 * @param int $decimals Precision of the number of decimal places.
 * @return string Converted number in string format.
 */
-function number_format_i18n( $number, $decimals = null ) {
+function number_format_i18n( $number, $decimals = 0 ) {
 	global $wp_locale;
-	// let the user override the precision only
+	$formatted = number_format( $number, absint( $decimals ), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
-	$decimals = ( is_null( $decimals ) ) ? $wp_locale->number_format['decimals'] : intval( $decimals );
+	return apply_filters( 'number_format_i18n', $formatted );
-	$num = number_format( $number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
-	// let the user translate digits from latin to localized language
-	return apply_filters( 'number_format_i18n', $num );
 }
 /**
 * Convert number of bytes largest unit bytes will fit into.
 *
 * @link http://en.wikipedia.org/wiki/Byte
 *
 * @since 2.3.0
 *
 * @param int|string $bytes Number of bytes. Note max integer size for integers.
-* @param int $decimals Precision of number of decimal places.
+* @param int $decimals Precision of number of decimal places. Deprecated.
 * @return bool|string False on failure. Number string on success.
 */
-function size_format( $bytes, $decimals = null ) {
+function size_format( $bytes, $decimals = 0 ) {
 	$quant = array(
 		// ========================= Origin ====
 		'TB' => 1099511627776,  // pow( 1024, 4)
 		'GB' => 1073741824,     // pow( 1024, 3)
 		'MB' => 1048576,        // pow( 1024, 2)
 		'kB' => 1024,           // pow( 1024, 1)
 		'B ' => 1,              // pow( 1024, 0)
 	);
 	foreach ( $quant as $unit => $mag )
 		if ( doubleval($bytes) >= $mag )
 			return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
 	return false;
 	$my = substr( $mysqlstring, 0, 4 ); // Mysql string Year
 	$mm = substr( $mysqlstring, 8, 2 ); // Mysql string Month
 	$md = substr( $mysqlstring, 5, 2 ); // Mysql string day
 	$day = mktime( 0, 0, 0, $md, $mm, $my ); // The timestamp for mysqlstring day.
 	$weekday = date( 'w', $day ); // The day of the week from the timestamp
-	$i = 86400; // One day
+	if ( !is_numeric($start_of_week) )
-	if( !is_numeric($start_of_week) )
 		$start_of_week = get_option( 'start_of_week' );
 	if ( $weekday < $start_of_week )
-		$weekday = 7 - $start_of_week - $weekday;
+		$weekday += 7;
-	while ( $weekday > $start_of_week ) {
+	$start = $day - 86400 * ( $weekday - $start_of_week ); // The most recent week start day on or before $day
-		$weekday = date( 'w', $day );
+	$end = $start + 604799; // $start + 7 days - 1 second
-		if ( $weekday < $start_of_week )
+	return compact( 'start', 'end' );
-			$weekday = 7 - $start_of_week - $weekday;
-		$day -= 86400;
-		$i = 0;
-	}
-	$week['start'] = $day + 86400 - $i;
-	$week['end'] = $week['start'] + 604799;
-	return $week;
 }
 /**
 * Unserialize value only if it was serialized.
 *
 * @param mixed $data Value to check to see if was serialized.
 * @return bool False if not serialized and true if it was.
 */
 function is_serialized( $data ) {
 	// if it isn't a string, it isn't serialized
-	if ( !is_string( $data ) )
+	if ( ! is_string( $data ) )
 		return false;
 	$data = trim( $data );
 	if ( 'N;' == $data )
 		return true;
-	if ( !preg_match( '/^([adObis]):/', $data, $badions ) )
+	$length = strlen( $data );
+	if ( $length < 4 )
 		return false;
-	switch ( $badions[1] ) {
+	if ( ':' !== $data[1] )
+		return false;
+	$lastc = $data[$length-1];
+	if ( ';' !== $lastc && '}' !== $lastc )
+		return false;
+	$token = $data[0];
+	switch ( $token ) {
+		case 's' :
+			if ( '"' !== $data[$length-2] )
+				return false;
 		case 'a' :
 		case 'O' :
-		case 's' :
+			return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
-			if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data ) )
-				return true;
-			break;
 		case 'b' :
 		case 'i' :
 		case 'd' :
-			if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data ) )
+			return (bool) preg_match( "/^{$token}:[0-9.E-]+;\$/", $data );
-				return true;
-			break;
 	}
 	return false;
 }
 /**
 function is_serialized_string( $data ) {
 	// if it isn't a string, it isn't a serialized string
 	if ( !is_string( $data ) )
 		return false;
 	$data = trim( $data );
-	if ( preg_match( '/^s:[0-9]+:.*;$/s', $data ) ) // this should fetch all serialized strings
+	$length = strlen( $data );
+	if ( $length < 4 )
+		return false;
+	elseif ( ':' !== $data[1] )
+		return false;
+	elseif ( ';' !== $data[$length-1] )
+		return false;
+	elseif ( $data[0] !== 's' )
+		return false;
+	elseif ( '"' !== $data[$length-2] )
+		return false;
+	else
 		return true;
-	return false;
-}
-/**
-* Retrieve option value based on setting name.
-*
-* If the option does not exist or does not have a value, then the return value
-* will be false. This is useful to check whether you need to install an option
-* and is commonly used during installation of plugin options and to test
-* whether upgrading is required.
-*
-* You can "short-circuit" the retrieval of the option from the database for
-* your plugin or core options that aren't protected. You can do so by hooking
-* into the 'pre_option_$option' with the $option being replaced by the option
-* name. You should not try to override special options, but you will not be
-* prevented from doing so.
-*
-* There is a second filter called 'option_$option' with the $option being
-* replaced with the option name. This gives the value as the only parameter.
-*
-* If the option was serialized, when the option was added and, or updated, then
-* it will be unserialized, when it is returned.
-*
-* @since 1.5.0
-* @package WordPress
-* @subpackage Option
-* @uses apply_filters() Calls 'pre_option_$optionname' false to allow
-*		overwriting the option value in a plugin.
-* @uses apply_filters() Calls 'option_$optionname' with the option name value.
-*
-* @param string $setting Name of option to retrieve. Should already be SQL-escaped
-* @return mixed Value set for the option.
-*/
-function get_option( $setting, $default = false ) {
-	global $wpdb;
-	// Allow plugins to short-circuit options.
-	$pre = apply_filters( 'pre_option_' . $setting, false );
-	if ( false !== $pre )
-		return $pre;
-	// prevent non-existent options from triggering multiple queries
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( isset( $notoptions[$setting] ) )
-		return $default;
-	$alloptions = wp_load_alloptions();
-	if ( isset( $alloptions[$setting] ) ) {
-		$value = $alloptions[$setting];
-	} else {
-		$value = wp_cache_get( $setting, 'options' );
-		if ( false === $value ) {
-			if ( defined( 'WP_INSTALLING' ) )
-				$suppress = $wpdb->suppress_errors();
-			// expected_slashed ($setting)
-			$row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
-			if ( defined( 'WP_INSTALLING' ) )
-				$wpdb->suppress_errors($suppress);
-			if ( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
-				$value = $row->option_value;
-				wp_cache_add( $setting, $value, 'options' );
-			} else { // option does not exist, so we must cache its non-existence
-				$notoptions[$setting] = true;
-				wp_cache_set( 'notoptions', $notoptions, 'options' );
-				return $default;
-			}
-		}
-	}
-	// If home is not set use siteurl.
-	if ( 'home' == $setting && '' == $value )
-		return get_option( 'siteurl' );
-	if ( in_array( $setting, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
-	return apply_filters( 'option_' . $setting, maybe_unserialize( $value ) );
-}
-/**
-* Protect WordPress special option from being modified.
-*
-* Will die if $option is in protected list. Protected options are 'alloptions'
-* and 'notoptions' options.
-*
-* @since 2.2.0
-* @package WordPress
-* @subpackage Option
-*
-* @param string $option Option name.
-*/
-function wp_protect_special_option( $option ) {
-	$protected = array( 'alloptions', 'notoptions' );
-	if ( in_array( $option, $protected ) )
-		die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
-}
-/**
-* Print option value after sanitizing for forms.
-*
-* @uses attr Sanitizes value.
-* @since 1.5.0
-* @package WordPress
-* @subpackage Option
-*
-* @param string $option Option name.
-*/
-function form_option( $option ) {
-	echo esc_attr(get_option( $option ) );
-}
-/**
-* Retrieve all autoload options or all options, if no autoloaded ones exist.
-*
-* This is different from wp_load_alloptions() in that this function does not
-* cache its results and will retrieve all options from the database every time
-*
-* it is called.
-*
-* @since 1.0.0
-* @package WordPress
-* @subpackage Option
-* @uses apply_filters() Calls 'pre_option_$optionname' hook with option value as parameter.
-* @uses apply_filters() Calls 'all_options' on options list.
-*
-* @return array List of all options.
-*/
-function get_alloptions() {
-	global $wpdb;
-	$show = $wpdb->hide_errors();
-	if ( !$options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-		$options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
-	$wpdb->show_errors($show);
-	foreach ( (array) $options as $option ) {
-		// "When trying to design a foolproof system,
-		//  never underestimate the ingenuity of the fools :)" -- Dougal
-		if ( in_array( $option->option_name, array( 'siteurl', 'home', 'category_base', 'tag_base' ) ) )
-			$option->option_value = untrailingslashit( $option->option_value );
-		$value = maybe_unserialize( $option->option_value );
-		$all_options->{$option->option_name} = apply_filters( 'pre_option_' . $option->option_name, $value );
-	}
-	return apply_filters( 'all_options', $all_options );
-}
-/**
-* Loads and caches all autoloaded options, if available or all options.
-*
-* This is different from get_alloptions(), in that this function will cache the
-* options and will return the cached options when called again.
-*
-* @since 2.2.0
-* @package WordPress
-* @subpackage Option
-*
-* @return array List all options.
-*/
-function wp_load_alloptions() {
-	global $wpdb;
-	$alloptions = wp_cache_get( 'alloptions', 'options' );
-	if ( !$alloptions ) {
-		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
-		$wpdb->suppress_errors($suppress);
-		$alloptions = array();
-		foreach ( (array) $alloptions_db as $o )
-			$alloptions[$o->option_name] = $o->option_value;
-		wp_cache_add( 'alloptions', $alloptions, 'options' );
-	}
-	return $alloptions;
-}
-/**
-* Update the value of an option that was already added.
-*
-* You do not need to serialize values, if the value needs to be serialize, then
-* it will be serialized before it is inserted into the database. Remember,
-* resources can not be serialized or added as an option.
-*
-* If the option does not exist, then the option will be added with the option
-* value, but you will not be able to set whether it is autoloaded. If you want
-* to set whether an option autoloaded, then you need to use the add_option().
-*
-* Before the option is updated, then the filter named
-* 'pre_update_option_$option_name', with the $option_name as the $option_name
-* parameter value, will be called. The hook should accept two parameters, the
-* first is the new value and the second is the old value.  Whatever is
-* returned will be used as the new value.
-*
-* After the value has been updated the action named 'update_option_$option_name'
-* will be called.  This action receives two parameters the first being the old
-* value and the second the new value.
-*
-* @since 1.0.0
-* @package WordPress
-* @subpackage Option
-*
-* @param string $option_name Option name. Expected to not be SQL-escaped
-* @param mixed $newvalue Option value.
-* @return bool False if value was not updated and true if value was updated.
-*/
-function update_option( $option_name, $newvalue ) {
-	global $wpdb;
-	wp_protect_special_option( $option_name );
-	$safe_option_name = esc_sql( $option_name );
-	$newvalue = sanitize_option( $option_name, $newvalue );
-	$oldvalue = get_option( $safe_option_name );
-	$newvalue = apply_filters( 'pre_update_option_' . $option_name, $newvalue, $oldvalue );
-	// If the new and old values are the same, no need to update.
-	if ( $newvalue === $oldvalue )
-		return false;
-	if ( false === $oldvalue ) {
-		add_option( $option_name, $newvalue );
-		return true;
-	}
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option_name] ) ) {
-		unset( $notoptions[$option_name] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
-	}
-	$_newvalue = $newvalue;
-	$newvalue = maybe_serialize( $newvalue );
-	do_action( 'update_option', $option_name, $oldvalue, $newvalue );
-	$alloptions = wp_load_alloptions();
-	if ( isset( $alloptions[$option_name] ) ) {
-		$alloptions[$option_name] = $newvalue;
-		wp_cache_set( 'alloptions', $alloptions, 'options' );
-	} else {
-		wp_cache_set( $option_name, $newvalue, 'options' );
-	}
-	$wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) );
-	if ( $wpdb->rows_affected == 1 ) {
-		do_action( "update_option_{$option_name}", $oldvalue, $_newvalue );
-		do_action( 'updated_option', $option_name, $oldvalue, $_newvalue );
-		return true;
-	}
-	return false;
-}
-/**
-* Add a new option.
-*
-* You do not need to serialize values, if the value needs to be serialize, then
-* it will be serialized before it is inserted into the database. Remember,
-* resources can not be serialized or added as an option.
-*
-* You can create options without values and then add values later. Does not
-* check whether the option has already been added, but does check that you
-* aren't adding a protected WordPress option. Care should be taken to not name
-* options, the same as the ones which are protected and to not add options
-* that were already added.
-*
-* The filter named 'add_option_$optionname', with the $optionname being
-* replaced with the option's name, will be called. The hook should accept two
-* parameters, the first is the option name, and the second is the value.
-*
-* @package WordPress
-* @subpackage Option
-* @since 1.0.0
-* @link http://alex.vort-x.net/blog/ Thanks Alex Stapleton
-*
-* @param string $name Option name to add. Expects to NOT be SQL escaped.
-* @param mixed $value Optional. Option value, can be anything.
-* @param mixed $deprecated Optional. Description. Not used anymore.
-* @param bool $autoload Optional. Default is enabled. Whether to load the option when WordPress starts up.
-* @return null returns when finished.
-*/
-function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
-	global $wpdb;
-	wp_protect_special_option( $name );
-	$safe_name = esc_sql( $name );
-	$value = sanitize_option( $name, $value );
-	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$name] ) )
-		if ( false !== get_option( $safe_name ) )
-			return;
-	$value = maybe_serialize( $value );
-	$autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
-	do_action( 'add_option', $name, $value );
-	if ( 'yes' == $autoload ) {
-		$alloptions = wp_load_alloptions();
-		$alloptions[$name] = $value;
-		wp_cache_set( 'alloptions', $alloptions, 'options' );
-	} else {
-		wp_cache_set( $name, $value, 'options' );
-	}
-	// This option exists now
-	$notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
-	if ( is_array( $notoptions ) && isset( $notoptions[$name] ) ) {
-		unset( $notoptions[$name] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
-	}
-	$wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $name, $value, $autoload ) );
-	do_action( "add_option_{$name}", $name, $value );
-	do_action( 'added_option', $name, $value );
-	return;
-}
-/**
-* Removes option by name and prevents removal of protected WordPress options.
-*
-* @package WordPress
-* @subpackage Option
-* @since 1.2.0
-*
-* @param string $name Option name to remove.
-* @return bool True, if succeed. False, if failure.
-*/
-function delete_option( $name ) {
-	global $wpdb;
-	wp_protect_special_option( $name );
-	// Get the ID, if no ID then return
-	// expected_slashed ($name)
-	$option = $wpdb->get_row( "SELECT autoload FROM $wpdb->options WHERE option_name = '$name'" );
-	if ( is_null($option) )
-		return false;
-	do_action( 'delete_option', $name );
-	// expected_slashed ($name)
-	$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
-	if ( 'yes' == $option->autoload ) {
-		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$name] ) ) {
-			unset( $alloptions[$name] );
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
-		}
-	} else {
-		wp_cache_delete( $name, 'options' );
-	}
-	do_action( 'deleted_option', $name );
-	return true;
-}
-/**
-* Delete a transient
-*
-* @since 2.8.0
-* @package WordPress
-* @subpackage Transient
-*
-* @param string $transient Transient name. Expected to not be SQL-escaped
-* @return bool true if successful, false otherwise
-*/
-function delete_transient($transient) {
-	global $_wp_using_ext_object_cache, $wpdb;
-	if ( $_wp_using_ext_object_cache ) {
-		return wp_cache_delete($transient, 'transient');
-	} else {
-		$transient = '_transient_' . esc_sql($transient);
-		return delete_option($transient);
-	}
-}
-/**
-* Get the value of a transient
-*
-* If the transient does not exist or does not have a value, then the return value
-* will be false.
-*
-* @since 2.8.0
-* @package WordPress
-* @subpackage Transient
-*
-* @param string $transient Transient name. Expected to not be SQL-escaped
-* @return mixed Value of transient
-*/
-function get_transient($transient) {
-	global $_wp_using_ext_object_cache, $wpdb;
-	$pre = apply_filters( 'pre_transient_' . $transient, false );
-	if ( false !== $pre )
-		return $pre;
-	if ( $_wp_using_ext_object_cache ) {
-		$value = wp_cache_get($transient, 'transient');
-	} else {
-		$transient_option = '_transient_' . esc_sql($transient);
-		// If option is not in alloptions, it is not autoloaded and thus has a timeout
-		$alloptions = wp_load_alloptions();
-		if ( !isset( $alloptions[$transient_option] ) ) {
-			$transient_timeout = '_transient_timeout_' . esc_sql($transient);
-			if ( get_option($transient_timeout) < time() ) {
-				delete_option($transient_option);
-				delete_option($transient_timeout);
-				return false;
-			}
-		}
-		$value = get_option($transient_option);
-	}
-	return apply_filters('transient_' . $transient, $value);
-}
-/**
-* Set/update the value of a transient
-*
-* You do not need to serialize values, if the value needs to be serialize, then
-* it will be serialized before it is set.
-*
-* @since 2.8.0
-* @package WordPress
-* @subpackage Transient
-*
-* @param string $transient Transient name. Expected to not be SQL-escaped
-* @param mixed $value Transient value.
-* @param int $expiration Time until expiration in seconds, default 0
-* @return bool False if value was not set and true if value was set.
-*/
-function set_transient($transient, $value, $expiration = 0) {
-	global $_wp_using_ext_object_cache, $wpdb;
-	if ( $_wp_using_ext_object_cache ) {
-		return wp_cache_set($transient, $value, 'transient', $expiration);
-	} else {
-		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient = '_transient_' . $transient;
-		$safe_transient = esc_sql($transient);
-		if ( false === get_option( $safe_transient ) ) {
-			$autoload = 'yes';
-			if ( 0 != $expiration ) {
-				$autoload = 'no';
-				add_option($transient_timeout, time() + $expiration, '', 'no');
-			}
-			return add_option($transient, $value, '', $autoload);
-		} else {
-			if ( 0 != $expiration )
-				update_option($transient_timeout, time() + $expiration);
-			return update_option($transient, $value);
-		}
-	}
-}
-/**
-* Saves and restores user interface settings stored in a cookie.
-*
-* Checks if the current user-settings cookie is updated and stores it. When no
-* cookie exists (different browser used), adds the last saved cookie restoring
-* the settings.
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.7.0
-*/
-function wp_user_settings() {
-	if ( ! is_admin() )
-		return;
-	if ( defined('DOING_AJAX') )
-		return;
-	if ( ! $user = wp_get_current_user() )
-		return;
-	$settings = get_user_option( 'user-settings', $user->ID, false );
-	if ( isset( $_COOKIE['wp-settings-' . $user->ID] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] );
-		if ( ! empty( $cookie ) && strpos( $cookie, '=' ) ) {
-			if ( $cookie == $settings )
-				return;
-			$last_time = (int) get_user_option( 'user-settings-time', $user->ID, false );
-			$saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0;
-			if ( $saved > $last_time ) {
-				update_user_option( $user->ID, 'user-settings', $cookie, false );
-				update_user_option( $user->ID, 'user-settings-time', time() - 5, false );
-				return;
-			}
-		}
-	}
-	setcookie( 'wp-settings-' . $user->ID, $settings, time() + 31536000, SITECOOKIEPATH );
-	setcookie( 'wp-settings-time-' . $user->ID, time(), time() + 31536000, SITECOOKIEPATH );
-	$_COOKIE['wp-settings-' . $user->ID] = $settings;
-}
-/**
-* Retrieve user interface setting value based on setting name.
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.7.0
-*
-* @param string $name The name of the setting.
-* @param string $default Optional default value to return when $name is not set.
-* @return mixed the last saved user setting or the default value/false if it doesn't exist.
-*/
-function get_user_setting( $name, $default = false ) {
-	$all = get_all_user_settings();
-	return isset($all[$name]) ? $all[$name] : $default;
-}
-/**
-* Add or update user interface setting.
-*
-* Both $name and $value can contain only ASCII letters, numbers and underscores.
-* This function has to be used before any output has started as it calls setcookie().
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.8.0
-*
-* @param string $name The name of the setting.
-* @param string $value The value for the setting.
-* @return bool true if set successfully/false if not.
-*/
-function set_user_setting( $name, $value ) {
-	if ( headers_sent() )
-		return false;
-	$all = get_all_user_settings();
-	$name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name );
-	if ( empty($name) )
-		return false;
-	$all[$name] = $value;
-	return wp_set_all_user_settings($all);
-}
-/**
-* Delete user interface settings.
-*
-* Deleting settings would reset them to the defaults.
-* This function has to be used before any output has started as it calls setcookie().
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.7.0
-*
-* @param mixed $names The name or array of names of the setting to be deleted.
-* @return bool true if deleted successfully/false if not.
-*/
-function delete_user_setting( $names ) {
-	if ( headers_sent() )
-		return false;
-	$all = get_all_user_settings();
-	$names = (array) $names;
-	foreach ( $names as $name ) {
-		if ( isset($all[$name]) ) {
-			unset($all[$name]);
-			$deleted = true;
-		}
-	}
-	if ( isset($deleted) )
-		return wp_set_all_user_settings($all);
-	return false;
-}
-/**
-* Retrieve all user interface settings.
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.7.0
-*
-* @return array the last saved user settings or empty array.
-*/
-function get_all_user_settings() {
-	global $_updated_user_settings;
-	if ( ! $user = wp_get_current_user() )
-		return array();
-	if ( isset($_updated_user_settings) && is_array($_updated_user_settings) )
-		return $_updated_user_settings;
-	$all = array();
-	if ( isset($_COOKIE['wp-settings-' . $user->ID]) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] );
-		if ( $cookie && strpos($cookie, '=') ) // the '=' cannot be 1st char
-			parse_str($cookie, $all);
-	} else {
-		$option = get_user_option('user-settings', $user->ID);
-		if ( $option && is_string($option) )
-			parse_str( $option, $all );
-	}
-	return $all;
-}
-/**
-* Private. Set all user interface settings.
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.8.0
-*
-*/
-function wp_set_all_user_settings($all) {
-	global $_updated_user_settings;
-	if ( ! $user = wp_get_current_user() )
-		return false;
-	$_updated_user_settings = $all;
-	$settings = '';
-	foreach ( $all as $k => $v ) {
-		$v = preg_replace( '/[^A-Za-z0-9_]+/', '', $v );
-		$settings .= $k . '=' . $v . '&';
-	}
-	$settings = rtrim($settings, '&');
-	update_user_option( $user->ID, 'user-settings', $settings, false );
-	update_user_option( $user->ID, 'user-settings-time', time(), false );
-	return true;
-}
-/**
-* Delete the user settings of the current user.
-*
-* @package WordPress
-* @subpackage Option
-* @since 2.7.0
-*/
-function delete_all_user_settings() {
-	if ( ! $user = wp_get_current_user() )
-		return;
-	update_user_option( $user->ID, 'user-settings', '', false );
-	setcookie('wp-settings-' . $user->ID, ' ', time() - 31536000, SITECOOKIEPATH);
 }
 /**
 * Serialize data, if needed.
 *
 */
 function maybe_serialize( $data ) {
 	if ( is_array( $data ) || is_object( $data ) )
 		return serialize( $data );
+	// Double serialization is required for backward compatibility.
+	// See http://core.trac.wordpress.org/ticket/12930
 	if ( is_serialized( $data ) )
 		return serialize( $data );
 	return $data;
 }
 	$content = trim( $content );
 	return $content;
 }
 /**
-* Open the file handle for debugging.
-*
-* This function is used for XMLRPC feature, but it is general purpose enough
-* to be used in anywhere.
-*
-* @see fopen() for mode options.
-* @package WordPress
-* @subpackage Debug
-* @since 0.71
-* @uses $debug Used for whether debugging is enabled.
-*
-* @param string $filename File path to debug file.
-* @param string $mode Same as fopen() mode parameter.
-* @return bool|resource File handle. False on failure.
-*/
-function debug_fopen( $filename, $mode ) {
-	global $debug;
-	if ( 1 == $debug ) {
-		$fp = fopen( $filename, $mode );
-		return $fp;
-	} else {
-		return false;
-	}
-}
-/**
-* Write contents to the file used for debugging.
-*
-* Technically, this can be used to write to any file handle when the global
-* $debug is set to 1 or true.
-*
-* @package WordPress
-* @subpackage Debug
-* @since 0.71
-* @uses $debug Used for whether debugging is enabled.
-*
-* @param resource $fp File handle for debugging file.
-* @param string $string Content to write to debug file.
-*/
-function debug_fwrite( $fp, $string ) {
-	global $debug;
-	if ( 1 == $debug )
-		fwrite( $fp, $string );
-}
-/**
-* Close the debugging file handle.
-*
-* Technically, this can be used to close any file handle when the global $debug
-* is set to 1 or true.
-*
-* @package WordPress
-* @subpackage Debug
-* @since 0.71
-* @uses $debug Used for whether debugging is enabled.
-*
-* @param resource $fp Debug File handle.
-*/
-function debug_fclose( $fp ) {
-	global $debug;
-	if ( 1 == $debug )
-		fclose( $fp );
-}
-/**
 * Check content for video and audio links to add as enclosures.
 *
 * Will not add enclosures that have already been added and will
 * remove enclosures that are no longer in the post. This is called as
 * pingbacks and trackbacks.
 * @param string $content Post Content
 * @param int $post_ID Post ID
 */
 function do_enclose( $content, $post_ID ) {
 	global $wpdb;
+	//TODO: Tidy this ghetto code up and make the debug code optional
 	include_once( ABSPATH . WPINC . '/class-IXR.php' );
-	$log = debug_fopen( ABSPATH . 'enclosures.log', 'a' );
 	$post_links = array();
-	debug_fwrite( $log, 'BEGIN ' . date( 'YmdHis', time() ) . "\n" );
 	$pung = get_enclosed( $post_ID );
 	$ltrs = '\w';
 	$gunk = '/#~:.?+=&%@!\-';
 	$punc = '.:?\-';
 	$any = $ltrs . $gunk . $punc;
 	preg_match_all( "{\b http : [$any] +? (?= [$punc] * [^$any] | $)}x", $content, $post_links_temp );
-	debug_fwrite( $log, 'Post contents:' );
-	debug_fwrite( $log, $content . "\n" );
 	foreach ( $pung as $link_test ) {
 		if ( !in_array( $link_test, $post_links_temp[0] ) ) { // link no longer in post
-			$mid = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $link_test . '%') );
+			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $link_test ) . '%') );
-			do_action( 'delete_postmeta', $mid );
+			foreach ( $mids as $mid )
-			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE post_id IN(%s)", implode( ',', $mid ) ) );
+				delete_metadata_by_mid( 'post', $mid );
-			do_action( 'deleted_postmeta', $mid );
 		}
 	}
 	foreach ( (array) $post_links_temp[0] as $link_test ) {
 		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
-			$test = parse_url( $link_test );
+			$test = @parse_url( $link_test );
+			if ( false === $test )
+				continue;
 			if ( isset( $test['query'] ) )
 				$post_links[] = $link_test;
-			elseif ( $test['path'] != '/' && $test['path'] != '' )
+			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
 				$post_links[] = $link_test;
 		}
 	}
 	foreach ( (array) $post_links as $url ) {
-		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $url . '%' ) ) ) {
+		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $url ) . '%' ) ) ) {
 			if ( $headers = wp_get_http_headers( $url) ) {
-				$len = (int) $headers['content-length'];
+				$len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type = $headers['content-type'];
+				$type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
 				$allowed_types = array( 'video', 'audio' );
+				// Check to see if we can figure out the mime type from
+				// the extension
+				$url_parts = @parse_url( $url );
+				if ( false !== $url_parts ) {
+					$extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
+					if ( !empty( $extension ) ) {
+						foreach ( get_allowed_mime_types( ) as $exts => $mime ) {
+							if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+								$type = $mime;
+								break;
+							}
+						}
+					}
+				}
 				if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-					$meta_value = "$url\n$len\n$type\n";
+					add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
-					$wpdb->insert($wpdb->postmeta, array('post_id' => $post_ID, 'meta_key' => 'enclosure', 'meta_value' => $meta_value) );
-					do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, 'enclosure', $meta_value );
 				}
 			}
 		}
 	}
 }
 *
 * @since 2.5.0
 *
 * @param string $url URL to fetch.
 * @param string|bool $file_path Optional. File path to write request to.
-* @param bool $deprecated Deprecated. Not used.
+* @param int $red (private) The number of Redirects followed, Upon 5 being hit, returns false.
 * @return bool|string False on failure and string of headers if HEAD request.
 */
-function wp_get_http( $url, $file_path = false, $deprecated = false ) {
+function wp_get_http( $url, $file_path = false, $red = 1 ) {
 	@set_time_limit( 60 );
+	if ( $red > 5 )
+		return false;
 	$options = array();
 	$options['redirection'] = 5;
 	if ( false == $file_path )
 	if ( is_wp_error( $response ) )
 		return false;
 	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = $response['response']['code'];
+	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	// WP_HTTP no longer follows redirects for HEAD requests.
+	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
+		return wp_get_http( $headers['location'], $file_path, ++$red );
+	}
 	if ( false == $file_path )
 		return $headers;
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
 	if ( !$out_fp )
 		return $headers;
-	fwrite( $out_fp,  $response['body']);
+	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);
+	clearstatcache();
 	return $headers;
 }
 /**
 * @param string $url
 * @param bool $deprecated Not Used.
 * @return bool|string False on failure, headers on success.
 */
 function wp_get_http_headers( $url, $deprecated = false ) {
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '2.7' );
 	$response = wp_remote_head( $url );
 	if ( is_wp_error( $response ) )
 		return false;
 * @uses $previousday Previous day
 *
 * @return int 1 when new day, 0 if not a new day.
 */
 function is_new_day() {
-	global $day, $previousday;
+	global $currentday, $previousday;
-	if ( $day != $previousday )
+	if ( $currentday != $previousday )
 		return 1;
 	else
 		return 0;
 }
 */
 function build_query( $data ) {
 	return _http_build_query( $data, null, '&', '', false );
 }
+// from php.net (modified by Mark Jaquith to behave like the native PHP5 function)
+function _http_build_query($data, $prefix=null, $sep=null, $key='', $urlencode=true) {
+	$ret = array();
+	foreach ( (array) $data as $k => $v ) {
+		if ( $urlencode)
+			$k = urlencode($k);
+		if ( is_int($k) && $prefix != null )
+			$k = $prefix.$k;
+		if ( !empty($key) )
+			$k = $key . '%5B' . $k . '%5D';
+		if ( $v === null )
+			continue;
+		elseif ( $v === FALSE )
+			$v = '0';
+		if ( is_array($v) || is_object($v) )
+			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+		elseif ( $urlencode )
+			array_push($ret, $k.'='.urlencode($v));
+		else
+			array_push($ret, $k.'='.$v);
+	}
+	if ( null === $sep )
+		$sep = ini_get('arg_separator.output');
+	return implode($sep, $ret);
+}
 /**
 * Retrieve a modified URL query string.
 *
 * You can rebuild the URL and append a new query variable to the URL query by
 * using this function. You can also retrieve the full URL with query data.
 *
 * Adding a single key & value or an associative array. Setting a key value to
-* emptystring removes the key. Omitting oldquery_or_uri uses the $_SERVER
+* an empty string removes the key. Omitting oldquery_or_uri uses the $_SERVER
-* value.
+* value. Additional values provided are expected to be encoded appropriately
+* with urlencode() or rawurlencode().
 *
 * @since 1.5.0
 *
 * @param mixed $param1 Either newkey or an associative_array
 * @param mixed $param2 Either newvalue or oldquery or uri
 }
 /**
 * Walks the array while sanitizing the contents.
 *
-* @uses $wpdb Used to sanitize values
 * @since 0.71
 *
 * @param array $array Array to used to walk while sanitizing contents.
 * @return array Sanitized $array.
 */
 function add_magic_quotes( $array ) {
-	global $wpdb;
 	foreach ( (array) $array as $k => $v ) {
 		if ( is_array( $v ) ) {
 			$array[$k] = add_magic_quotes( $v );
 		} else {
-			$array[$k] = esc_sql( $v );
+			$array[$k] = addslashes( $v );
 		}
 	}
 	return $array;
 }
 	$response = wp_remote_get( $uri, $options );
 	if ( is_wp_error( $response ) )
 		return false;
-	return $response['body'];
+	return wp_remote_retrieve_body( $response );
 }
 /**
-* Setup the WordPress query.
+* Set up the WordPress query.
 *
 * @since 2.0.0
 *
 * @param string $query_vars Default WP_Query arguments.
 */
 function wp( $query_vars = '' ) {
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
-	if( !isset($wp_the_query) )
+	if ( !isset($wp_the_query) )
 		$wp_the_query = $wp_query;
 }
 /**
 * Retrieve the description for the HTTP status.
 * @uses apply_filters() Calls 'status_header' on status header string, HTTP
 *		HTTP code, HTTP code description, and protocol string as separate
 *		parameters.
 *
 * @param int $header HTTP status code
-* @return null Does not return anything.
+* @return unknown
 */
 function status_header( $header ) {
 	$text = get_status_header_desc( $header );
 	if ( empty( $text ) )
 * Gets the header information to prevent caching.
 *
 * The several different headers cover the different ways cache prevention is handled
 * by different browsers
 *
-* @since 2.8
+* @since 2.8.0
 *
 * @uses apply_filters()
 * @return array The associative array of header names and field values.
 */
 function wp_get_nocache_headers() {
 		'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
 		'Pragma' => 'no-cache',
 	);
 	if ( function_exists('apply_filters') ) {
-		$headers = apply_filters('nocache_headers', $headers);
+		$headers = (array) apply_filters('nocache_headers', $headers);
 	}
 	return $headers;
 }
 /**
 * @since 2.0.0
 * @uses wp_get_nocache_headers()
 */
 function nocache_headers() {
 	$headers = wp_get_nocache_headers();
-	foreach( (array) $headers as $name => $field_value )
+	foreach( $headers as $name => $field_value )
 		@header("{$name}: {$field_value}");
 }
 /**
 * Set the headers for caching for 10 days with JavaScript content type.
 	if ( $feed == '' || $feed == 'feed' )
 		$feed = get_default_feed();
 	$hook = 'do_feed_' . $feed;
 	if ( !has_action($hook) ) {
-		$message = sprintf( __( 'ERROR: %s is not a valid feed template' ), esc_html($feed));
+		$message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
-		wp_die($message);
+		wp_die( $message, '', array( 'response' => 404 ) );
 	}
 	do_action( $hook, $wp_query->is_comment_feed );
 }
 function do_feed_rdf() {
 	load_template( ABSPATH . WPINC . '/feed-rdf.php' );
 }
 /**
-* Load the RSS 1.0 Feed Template
+* Load the RSS 1.0 Feed Template.
 *
 * @since 2.1.0
 */
 function do_feed_rss() {
 	load_template( ABSPATH . WPINC . '/feed-rss.php' );
 	else
 		load_template( ABSPATH . WPINC . '/feed-atom.php' );
 }
 /**
-* Display the robot.txt file content.
+* Display the robots.txt file content.
 *
 * The echo content should be with usage of the permalinks or for creating the
-* robot.txt file.
+* robots.txt file.
 *
 * @since 2.1.0
-* @uses do_action() Calls 'do_robotstxt' hook for displaying robot.txt rules.
+* @uses do_action() Calls 'do_robotstxt' hook for displaying robots.txt rules.
 */
 function do_robots() {
 	header( 'Content-Type: text/plain; charset=utf-8' );
 	do_action( 'do_robotstxt' );
-	if ( '0' == get_option( 'blog_public' ) ) {
+	$output = "User-agent: *\n";
-		echo "User-agent: *\n";
+	$public = get_option( 'blog_public' );
-		echo "Disallow: /\n";
+	if ( '0' == $public ) {
+		$output .= "Disallow: /\n";
 	} else {
-		echo "User-agent: *\n";
+		$site_url = parse_url( site_url() );
-		echo "Disallow:\n";
+		$path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
-	}
+		$output .= "Disallow: $path/wp-admin/\n";
+		$output .= "Disallow: $path/wp-includes/\n";
+	}
+	echo apply_filters('robots_txt', $output, $public);
 }
 /**
 * Test whether blog is already installed.
 *
 	// Check cache first. If options table goes away and we have true cached, oh well.
 	if ( wp_cache_get( 'is_blog_installed' ) )
 		return true;
 	$suppress = $wpdb->suppress_errors();
-	$alloptions = wp_load_alloptions();
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		$alloptions = wp_load_alloptions();
+	}
 	// If siteurl is not set to autoload, check it specifically
 	if ( !isset( $alloptions['siteurl'] ) )
 		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
 	else
 		$installed = $alloptions['siteurl'];
 	wp_cache_set( 'is_blog_installed', $installed );
 	if ( $installed )
 		return true;
+	// If visiting repair.php, return true and let it take over.
+	if ( defined( 'WP_REPAIRING' ) )
+		return true;
 	$suppress = $wpdb->suppress_errors();
-	$tables = $wpdb->get_col('SHOW TABLES');
-	$wpdb->suppress_errors( $suppress );
+	// Loop over the WP tables. If none exist, then scratch install is allowed.
-	// Loop over the WP tables.  If none exist, then scratch install is allowed.
 	// If one or more exist, suggest table repair since we got here because the options
 	// table could not be accessed.
-	foreach ($wpdb->tables as $table) {
+	$wp_tables = $wpdb->tables();
-		// If one of the WP tables exist, then we are in an insane state.
+	foreach ( $wp_tables as $table ) {
-		if ( in_array($wpdb->prefix . $table, $tables) ) {
+		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-			// If visiting repair.php, return true and let it take over.
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-			if ( defined('WP_REPAIRING') )
+			continue;
-				return true;
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-			// Die with a DB error.
+			continue;
-			$wpdb->error = __('One or more database tables are unavailable.  The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.');
-			dead_db();
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
-		}
+			continue;
-	}
+		// One or more tables exist. We are insane.
+		wp_load_translations_early();
+		// Die with a DB error.
+		$wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
+		dead_db();
+	}
+	$wpdb->suppress_errors( $suppress );
 	wp_cache_set( 'is_blog_installed', false );
 	return false;
 }
 *
 * The nonce field is used to validate that the contents of the form came from
 * the location on the current site and not somewhere else. The nonce does not
 * offer absolute protection, but should protect against most cases. It is very
 * important to use nonce field in forms.
-*
-* If you set $echo to true and set $referer to true, then you will need to
-* retrieve the {@link wp_referer_field() wp referer field}. If you have the
-* $referer set to true and are echoing the nonce field, it will also echo the
-* referer field.
 *
 * The $action and $name are optional, but if you want to have better security,
 * it is strongly suggested to set those two parameters. It is easier to just
 * call the function without any parameters, because validation of the nonce
 * doesn't require any parameters, but since crackers know what the default is
 * @return string Nonce field.
 */
 function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
 	$name = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
+	if ( $referer )
+		$nonce_field .= wp_referer_field( false );
 	if ( $echo )
 		echo $nonce_field;
-	if ( $referer )
-		wp_referer_field( $echo, 'previous' );
 	return $nonce_field;
 }
 /**
 * @since 2.0.4
 *
 * @param bool $echo Whether to echo or return the referer field.
 * @return string Referer field.
 */
-function wp_referer_field( $echo = true) {
+function wp_referer_field( $echo = true ) {
 	$ref = esc_attr( $_SERVER['REQUEST_URI'] );
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. $ref . '" />';
 	if ( $echo )
 		echo $referer_field;
 		echo $orig_referer_field;
 	return $orig_referer_field;
 }
 /**
-* Retrieve referer from '_wp_http_referer', HTTP referer, or current page respectively.
+* Retrieve referer from '_wp_http_referer' or HTTP referer. If it's the same
+* as the current request URL, will return false.
 *
 * @package WordPress
 * @subpackage Security
 * @since 2.0.4
 *
 * @return string|bool False on failure. Referer URL on success.
 */
 function wp_get_referer() {
-	$ref = '';
+	$ref = false;
 	if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
 		$ref = $_REQUEST['_wp_http_referer'];
 	else if ( ! empty( $_SERVER['HTTP_REFERER'] ) )
 		$ref = $_SERVER['HTTP_REFERER'];
-	if ( $ref !== $_SERVER['REQUEST_URI'] )
+	if ( $ref && $ref !== $_SERVER['REQUEST_URI'] )
 		return $ref;
 	return false;
 }
 /**
 * Will attempt to set permissions on folders.
 *
 * @since 2.0.1
 *
 * @param string $target Full path to attempt to create.
-* @return bool Whether the path was created or not. True if path already exists.
+* @return bool Whether the path was created. True if path already exists.
 */
 function wp_mkdir_p( $target ) {
 	// from php.net/mkdir user contributed notes
 	$target = str_replace( '//', '/', $target );
+	// safe mode fails with a trailing slash under certain PHP versions.
+	$target = rtrim($target, '/'); // Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
+	if ( empty($target) )
+		$target = '/';
 	if ( file_exists( $target ) )
 		return @is_dir( $target );
 	// Attempting to create the directory may clutter up our display.
 	if ( @mkdir( $target ) ) {
 function path_is_absolute( $path ) {
 	// this is definitive if true but fails if $path does not exist or contains a symbolic link
 	if ( realpath($path) == $path )
 		return true;
-	if ( strlen($path) == 0 || $path{0} == '.' )
+	if ( strlen($path) == 0 || $path[0] == '.' )
 		return false;
 	// windows allows absolute paths like this
 	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
 		return true;
 	// a path starting with / or \ is absolute; anything else is relative
-	return (bool) preg_match('#^[/\\\\]#', $path);
+	return ( $path[0] == '/' || $path[0] == '\\' );
 }
 /**
 * Join two filesystem paths together (e.g. 'give me $path relative to $base').
 *
 function path_join( $base, $path ) {
 	if ( path_is_absolute($path) )
 		return $path;
 	return rtrim($base, '/') . '/' . ltrim($path, '/');
+}
+/**
+* Determines a writable directory for temporary files.
+* Function's preference is to WP_CONTENT_DIR followed by the return value of <code>sys_get_temp_dir()</code>, before finally defaulting to /tmp/
+*
+* In the event that this function does not find a writable location, It may be overridden by the <code>WP_TEMP_DIR</code> constant in your <code>wp-config.php</code> file.
+*
+* @since 2.5.0
+*
+* @return string Writable temporary directory
+*/
+function get_temp_dir() {
+	static $temp;
+	if ( defined('WP_TEMP_DIR') )
+		return trailingslashit(WP_TEMP_DIR);
+	if ( $temp )
+		return trailingslashit($temp);
+	$temp = WP_CONTENT_DIR . '/';
+	if ( is_dir($temp) && @is_writable($temp) )
+		return $temp;
+	if  ( function_exists('sys_get_temp_dir') ) {
+		$temp = sys_get_temp_dir();
+		if ( @is_writable($temp) )
+			return trailingslashit($temp);
+	}
+	$temp = ini_get('upload_tmp_dir');
+	if ( is_dir($temp) && @is_writable($temp) )
+		return trailingslashit($temp);
+	$temp = '/tmp/';
+	return $temp;
 }
 /**
 * Get an array containing the current upload directory's path and url.
 *
 *
 * @param string $time Optional. Time formatted in 'yyyy/mm'.
 * @return array See above for description.
 */
 function wp_upload_dir( $time = null ) {
+	global $switched;
 	$siteurl = get_option( 'siteurl' );
 	$upload_path = get_option( 'upload_path' );
 	$upload_path = trim($upload_path);
+	$main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
 	if ( empty($upload_path) ) {
 		$dir = WP_CONTENT_DIR . '/uploads';
 	} else {
 		$dir = $upload_path;
 		if ( 'wp-content/uploads' == $upload_path ) {
 			$url = WP_CONTENT_URL . '/uploads';
 		else
 			$url = trailingslashit( $siteurl ) . $upload_path;
 	}
-	if ( defined('UPLOADS') ) {
+	if ( defined('UPLOADS') && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
 		$dir = ABSPATH . UPLOADS;
 		$url = trailingslashit( $siteurl ) . UPLOADS;
+	}
+	if ( is_multisite() && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
+		if ( defined( 'BLOGUPLOADDIR' ) )
+			$dir = untrailingslashit(BLOGUPLOADDIR);
+		$url = str_replace( UPLOADS, 'files', $url );
 	}
 	$bdir = $dir;
 	$burl = $url;
 	$uploads = apply_filters( 'upload_dir', array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ) );
 	// Make sure we have an uploads dir
 	if ( ! wp_mkdir_p( $uploads['path'] ) ) {
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $uploads['path'] );
+		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
+			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+		else
+			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 	return $uploads;
 }
 *
 * If the filename is not unique, then a number will be added to the filename
 * before the extension, and will continue adding numbers until the filename is
 * unique.
 *
-* The callback must accept two parameters, the first one is the directory and
+* The callback is passed three parameters, the first one is the directory, the
-* the second is the filename. The callback must be a function.
+* second is the filename, and the third is the extension.
 *
-* @since 2.5
+* @since 2.5.0
 *
 * @param string $dir
 * @param string $filename
-* @param string $unique_filename_callback Function name, must be a function.
+* @param mixed $unique_filename_callback Callback.
 * @return string New filename, if given wasn't unique.
 */
 function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
 	// sanitize the file name before we begin processing
 	$filename = sanitize_file_name($filename);
 	$info = pathinfo($filename);
 	$ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
 	$name = basename($filename, $ext);
 	// edge case: if file is named '.ext', treat as an empty name
-	if( $name === $ext )
+	if ( $name === $ext )
 		$name = '';
-	// Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
+	// Increment the file number until we have a unique file to save in $dir. Use callback if supplied.
-	if ( $unique_filename_callback && function_exists( $unique_filename_callback ) ) {
+	if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
-		$filename = $unique_filename_callback( $dir, $name );
+		$filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
 	} else {
 		$number = '';
 		// change '.ext' to lower case
 		if ( $ext && strtolower($ext) != $ext ) {
 * The permissions will be set on the new file automatically by this function.
 *
 * @since 2.0.0
 *
 * @param string $name
-* @param null $deprecated Not used. Set to null.
+* @param null $deprecated Never used. Set to null.
 * @param mixed $bits File content
 * @param string $time Optional. Time formatted in 'yyyy/mm'.
 * @return array
 */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '2.0' );
 	if ( empty( $name ) )
 		return array( 'error' => __( 'Empty filename' ) );
 	$wp_filetype = wp_check_filetype( $name );
 	if ( !$wp_filetype['ext'] )
 	$upload = wp_upload_dir( $time );
 	if ( $upload['error'] !== false )
 		return $upload;
+	$upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
+	if ( !is_array( $upload_bits_error ) ) {
+		$upload[ 'error' ] = $upload_bits_error;
+		return $upload;
+	}
 	$filename = wp_unique_filename( $upload['path'], $name );
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), dirname( $new_file ) );
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
+			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+		else
+			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 	$ifp = @ fopen( $new_file, 'wb' );
 	if ( ! $ifp )
 		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
+	clearstatcache();
 	// Set correct file permissions
 	$stat = @ stat( dirname( $new_file ) );
 	$perms = $stat['mode'] & 0007777;
 	$perms = $perms & 0000666;
 	@ chmod( $new_file, $perms );
+	clearstatcache();
 	// Compute the URL
 	$url = $upload['url'] . "/$filename";
 	return array( 'file' => $new_file, 'url' => $url, 'error' => false );
 *
 * @param string $ext The extension to search.
 * @return string|null The file type, example: audio, video, document, spreadsheet, etc. Null if not found.
 */
 function wp_ext2type( $ext ) {
-	$ext2type = apply_filters('ext2type', array(
+	$ext2type = apply_filters( 'ext2type', array(
-		'audio' => array('aac','ac3','aif','aiff','mp1','mp2','mp3','m3a','m4a','m4b','ogg','ram','wav','wma'),
+		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b', 'mka', 'mp1', 'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-		'video' => array('asf','avi','divx','dv','mov','mpg','mpeg','mp4','mpv','ogm','qt','rm','vob','wmv', 'm4v'),
+		'video'       => array( 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-		'document' => array('doc','docx','pages','odt','rtf','pdf'),
+		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf', 'rtf', 'wp',  'wpd' ),
-		'spreadsheet' => array('xls','xlsx','numbers','ods'),
+		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsb',  'xlsm' ),
-		'interactive' => array('ppt','pptx','key','odp','swf'),
+		'interactive' => array( 'key', 'ppt',  'pptx', 'pptm', 'odp',  'swf' ),
-		'text' => array('txt'),
+		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-		'archive' => array('tar','bz2','gz','cab','dmg','rar','sea','sit','sqx','zip'),
+		'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit', 'sqx', 'tar', 'tgz',  'zip', '7z' ),
-		'code' => array('css','html','php','js'),
+		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
 	));
 	foreach ( $ext2type as $type => $exts )
-		if ( in_array($ext, $exts) )
+		if ( in_array( $ext, $exts ) )
 			return $type;
 }
 /**
 * Retrieve the file type from the file name.
 			break;
 		}
 	}
 	return compact( 'ext', 'type' );
+}
+/**
+* Attempt to determine the real file type of a file.
+* If unable to, the file name extension will be used to determine type.
+*
+* If it's determined that the extension does not match the file's real type,
+* then the "proper_filename" value will be set with a proper filename and extension.
+*
+* Currently this function only supports validating images known to getimagesize().
+*
+* @since 3.0.0
+*
+* @param string $file Full path to the image.
+* @param string $filename The filename of the image (may differ from $file due to $file being in a tmp directory)
+* @param array $mimes Optional. Key is the file extension with value as the mime type.
+* @return array Values for the extension, MIME, and either a corrected filename or false if original $filename is valid
+*/
+function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
+	$proper_filename = false;
+	// Do basic extension validation and MIME mapping
+	$wp_filetype = wp_check_filetype( $filename, $mimes );
+	extract( $wp_filetype );
+	// We can't do any further validation without a file to work with
+	if ( ! file_exists( $file ) )
+		return compact( 'ext', 'type', 'proper_filename' );
+	// We're able to validate images using GD
+	if ( $type && 0 === strpos( $type, 'image/' ) && function_exists('getimagesize') ) {
+		// Attempt to figure out what type of image it actually is
+		$imgstats = @getimagesize( $file );
+		// If getimagesize() knows what kind of image it really is and if the real MIME doesn't match the claimed MIME
+		if ( !empty($imgstats['mime']) && $imgstats['mime'] != $type ) {
+			// This is a simplified array of MIMEs that getimagesize() can detect and their extensions
+			// You shouldn't need to use this filter, but it's here just in case
+			$mime_to_ext = apply_filters( 'getimagesize_mimes_to_exts', array(
+				'image/jpeg' => 'jpg',
+				'image/png'  => 'png',
+				'image/gif'  => 'gif',
+				'image/bmp'  => 'bmp',
+				'image/tiff' => 'tif',
+			) );
+			// Replace whatever is after the last period in the filename with the correct extension
+			if ( ! empty( $mime_to_ext[ $imgstats['mime'] ] ) ) {
+				$filename_parts = explode( '.', $filename );
+				array_pop( $filename_parts );
+				$filename_parts[] = $mime_to_ext[ $imgstats['mime'] ];
+				$new_filename = implode( '.', $filename_parts );
+				if ( $new_filename != $filename )
+					$proper_filename = $new_filename; // Mark that it changed
+				// Redefine the extension / MIME
+				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
+				extract( $wp_filetype );
+			}
+		}
+	}
+	// Let plugins try and validate other types of files
+	// Should return an array in the style of array( 'ext' => $ext, 'type' => $type, 'proper_filename' => $proper_filename )
+	return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes );
 }
 /**
 * Retrieve list of allowed mime types and file extensions.
 *
 		'avi' => 'video/avi',
 		'divx' => 'video/divx',
 		'flv' => 'video/x-flv',
 		'mov|qt' => 'video/quicktime',
 		'mpeg|mpg|mpe' => 'video/mpeg',
-		'txt|c|cc|h' => 'text/plain',
+		'txt|asc|c|cc|h' => 'text/plain',
+		'csv' => 'text/csv',
+		'tsv' => 'text/tab-separated-values',
+		'ics' => 'text/calendar',
 		'rtx' => 'text/richtext',
 		'css' => 'text/css',
 		'htm|html' => 'text/html',
-		'mp3|m4a' => 'audio/mpeg',
+		'mp3|m4a|m4b' => 'audio/mpeg',
 		'mp4|m4v' => 'video/mp4',
 		'ra|ram' => 'audio/x-realaudio',
 		'wav' => 'audio/wav',
-		'ogg' => 'audio/ogg',
+		'ogg|oga' => 'audio/ogg',
+		'ogv' => 'video/ogg',
 		'mid|midi' => 'audio/midi',
 		'wma' => 'audio/wma',
+		'mka' => 'audio/x-matroska',
+		'mkv' => 'video/x-matroska',
 		'rtf' => 'application/rtf',
 		'js' => 'application/javascript',
 		'pdf' => 'application/pdf',
 		'doc|docx' => 'application/msword',
-		'pot|pps|ppt|pptx' => 'application/vnd.ms-powerpoint',
+		'pot|pps|ppt|pptx|ppam|pptm|sldm|ppsm|potm' => 'application/vnd.ms-powerpoint',
 		'wri' => 'application/vnd.ms-write',
-		'xla|xls|xlsx|xlt|xlw' => 'application/vnd.ms-excel',
+		'xla|xls|xlsx|xlt|xlw|xlam|xlsb|xlsm|xltm' => 'application/vnd.ms-excel',
 		'mdb' => 'application/vnd.ms-access',
 		'mpp' => 'application/vnd.ms-project',
+		'docm|dotm' => 'application/vnd.ms-word',
+		'pptx|sldx|ppsx|potx' => 'application/vnd.openxmlformats-officedocument.presentationml',
+		'xlsx|xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml',
+		'docx|dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml',
+		'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
 		'swf' => 'application/x-shockwave-flash',
 		'class' => 'application/java',
 		'tar' => 'application/x-tar',
 		'zip' => 'application/zip',
 		'gz|gzip' => 'application/x-gzip',
+		'rar' => 'application/rar',
+		'7z' => 'application/x-7z-compressed',
 		'exe' => 'application/x-msdownload',
 		// openoffice formats
 		'odt' => 'application/vnd.oasis.opendocument.text',
 		'odp' => 'application/vnd.oasis.opendocument.presentation',
 		'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
 		'odg' => 'application/vnd.oasis.opendocument.graphics',
 		'odc' => 'application/vnd.oasis.opendocument.chart',
 		'odb' => 'application/vnd.oasis.opendocument.database',
 		'odf' => 'application/vnd.oasis.opendocument.formula',
+		// wordperfect formats
+		'wp|wpd' => 'application/wordperfect',
 		) );
 	}
 	return $mimes;
 }
 /**
 * Retrieve nonce action "Are you sure" message.
 *
-* The action is split by verb and noun. The action format is as follows:
+* Deprecated in 3.4.1 and 3.5.0. Backported to 3.3.3.
-* verb-action_extra. The verb is before the first dash and has the format of
+*
-* letters and no spaces and numbers. The noun is after the dash and before the
+* @since 2.0.4
-* underscore, if an underscore exists. The noun is also only letters.
+* @deprecated 3.4.1
-*
+* @deprecated Use wp_nonce_ays()
-* The filter will be called for any action, which is not defined by WordPress.
+* @see wp_nonce_ays()
-* You may use the filter for your plugin to explain nonce actions to the user,
+*
-* when they get the "Are you sure?" message. The filter is in the format of
+* @param string $action Nonce action.
-* 'explain_nonce_$verb-$noun' with the $verb replaced by the found verb and the
+* @return string Are you sure message.
-* $noun replaced by the found noun. The two parameters that are given to the
+*/
-* hook are the localized "Are you sure you want to do this?" message with the
+function wp_explain_nonce( $action ) {
-* extra text (the text after the underscore).
+	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
+	return __( 'Are you sure you want to do this?' );
+}
+/**
+* Display "Are You Sure" message to confirm the action being taken.
+*
+* If the action has the nonce explain message, then it will be displayed along
+* with the "Are you sure?" message.
 *
 * @package WordPress
 * @subpackage Security
 * @since 2.0.4
 *
-* @param string $action Nonce action.
-* @return string Are you sure message.
-*/
-function wp_explain_nonce( $action ) {
-	if ( $action !== -1 && preg_match( '/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches ) ) {
-		$verb = $matches[1];
-		$noun = $matches[2];
-		$trans = array();
-		$trans['update']['attachment'] = array( __( 'Your attempt to edit this attachment: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
-		$trans['add']['category']      = array( __( 'Your attempt to add this category has failed.' ), false );
-		$trans['delete']['category']   = array( __( 'Your attempt to delete this category: &#8220;%s&#8221; has failed.' ), 'get_cat_name' );
-		$trans['update']['category']   = array( __( 'Your attempt to edit this category: &#8220;%s&#8221; has failed.' ), 'get_cat_name' );
-		$trans['delete']['comment']    = array( __( 'Your attempt to delete this comment: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['unapprove']['comment'] = array( __( 'Your attempt to unapprove this comment: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['approve']['comment']   = array( __( 'Your attempt to approve this comment: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['update']['comment']    = array( __( 'Your attempt to edit this comment: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['bulk']['comments']     = array( __( 'Your attempt to bulk modify comments has failed.' ), false );
-		$trans['moderate']['comments'] = array( __( 'Your attempt to moderate comments has failed.' ), false );
-		$trans['add']['bookmark']      = array( __( 'Your attempt to add this link has failed.' ), false );
-		$trans['delete']['bookmark']   = array( __( 'Your attempt to delete this link: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['update']['bookmark']   = array( __( 'Your attempt to edit this link: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['bulk']['bookmarks']    = array( __( 'Your attempt to bulk modify links has failed.' ), false );
-		$trans['add']['page']          = array( __( 'Your attempt to add this page has failed.' ), false );
-		$trans['delete']['page']       = array( __( 'Your attempt to delete this page: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
-		$trans['update']['page']       = array( __( 'Your attempt to edit this page: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
-		$trans['edit']['plugin']       = array( __( 'Your attempt to edit this plugin file: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['activate']['plugin']   = array( __( 'Your attempt to activate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['add']['post']          = array( __( 'Your attempt to add this post has failed.' ), false );
-		$trans['delete']['post']       = array( __( 'Your attempt to delete this post: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
-		$trans['update']['post']       = array( __( 'Your attempt to edit this post: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
-		$trans['add']['user']          = array( __( 'Your attempt to add this user has failed.' ), false );
-		$trans['delete']['users']      = array( __( 'Your attempt to delete users has failed.' ), false );
-		$trans['bulk']['users']        = array( __( 'Your attempt to bulk modify users has failed.' ), false );
-		$trans['update']['user']       = array( __( 'Your attempt to edit this user: &#8220;%s&#8221; has failed.' ), 'get_the_author_meta', 'display_name' );
-		$trans['update']['profile']    = array( __( 'Your attempt to modify the profile for: &#8220;%s&#8221; has failed.' ), 'get_the_author_meta', 'display_name' );
-		$trans['update']['options']    = array( __( 'Your attempt to edit your settings has failed.' ), false );
-		$trans['update']['permalink']  = array( __( 'Your attempt to change your permalink structure to: %s has failed.' ), 'use_id' );
-		$trans['edit']['file']         = array( __( 'Your attempt to edit this file: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['edit']['theme']        = array( __( 'Your attempt to edit this theme file: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['switch']['theme']      = array( __( 'Your attempt to switch to this theme: &#8220;%s&#8221; has failed.' ), 'use_id' );
-		$trans['log']['out']           = array( sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'sitename' ) ), false );
-		if ( isset( $trans[$verb][$noun] ) ) {
-			if ( !empty( $trans[$verb][$noun][1] ) ) {
-				$lookup = $trans[$verb][$noun][1];
-				if ( isset($trans[$verb][$noun][2]) )
-					$lookup_value = $trans[$verb][$noun][2];
-				$object = $matches[4];
-				if ( 'use_id' != $lookup ) {
-					if ( isset( $lookup_value ) )
-						$object = call_user_func( $lookup, $lookup_value, $object );
-					else
-						$object = call_user_func( $lookup, $object );
-				}
-				return sprintf( $trans[$verb][$noun][0], esc_html($object) );
-			} else {
-				return $trans[$verb][$noun][0];
-			}
-		}
-		return apply_filters( 'explain_nonce_' . $verb . '-' . $noun, __( 'Are you sure you want to do this?' ), isset($matches[4]) ? $matches[4] : '' );
-	} else {
-		return apply_filters( 'explain_nonce_' . $action, __( 'Are you sure you want to do this?' ) );
-	}
-}
-/**
-* Display "Are You Sure" message to confirm the action being taken.
-*
-* If the action has the nonce explain message, then it will be displayed along
-* with the "Are you sure?" message.
-*
-* @package WordPress
-* @subpackage Security
-* @since 2.0.4
-*
 * @param string $action The nonce action.
 */
 function wp_nonce_ays( $action ) {
 	$title = __( 'WordPress Failure Notice' );
-	$html = esc_html( wp_explain_nonce( $action ) );
+	if ( 'log-out' == $action ) {
-	if ( 'log-out' == $action )
+		$html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '</p><p>';
-		$html .= "</p><p>" . sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url() );
+		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url() );
-	elseif ( wp_get_referer() )
+	} else {
-		$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		$html = __( 'Are you sure you want to do this?' );
+		if ( wp_get_referer() )
+			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+	}
 	wp_die( $html, $title, array('response' => 403) );
 }
 /**
 * Kill WordPress execution and display HTML message with error message.
 *
-* Call this function complements the die() PHP function. The difference is that
+* This function complements the die() PHP function. The difference is that
 * HTML will be displayed to the user. It is recommended to use this function
 * only, when the execution should not continue any further. It is not
 * recommended to call this function very often and try to handle as many errors
-* as possible siliently.
+* as possible silently.
 *
 * @since 2.0.4
 *
 * @param string $message Error message.
 * @param string $title Error title.
-* @param string|array $args Optional arguements to control behaviour.
+* @param string|array $args Optional arguments to control behavior.
 */
-function wp_die( $message, $title = '', $args = array() ) {
+function wp_die( $message = '', $title = '', $args = array() ) {
-	global $wp_locale;
+	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+		$function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
+	elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST )
+		$function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+	elseif ( defined( 'APP_REQUEST' ) && APP_REQUEST )
+		$function = apply_filters( 'wp_die_app_handler', '_scalar_wp_die_handler' );
+	else
+		$function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
+	call_user_func( $function, $message, $title, $args );
+}
+/**
+* Kill WordPress execution and display HTML message with error message.
+*
+* This is the default handler for wp_die if you want a custom one for your
+* site then you can overload using the wp_die_handler filter in wp_die
+*
+* @since 3.0.0
+* @access private
+*
+* @param string $message Error message.
+* @param string $title Error title.
+* @param string|array $args Optional arguments to control behavior.
+*/
+function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 	$defaults = array( 'response' => 500 );
 	$r = wp_parse_args($args, $defaults);
 	$have_gettext = function_exists('__');
 		$message = "<p>$message</p>";
 	}
 	if ( isset( $r['back_link'] ) && $r['back_link'] ) {
 		$back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back';
-		$message .= "\n<p><a href='javascript:history.back()'>$back_text</p>";
+		$message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
 	}
-	if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL )
+	if ( ! did_action( 'admin_head' ) ) :
-		$admin_dir = WP_SITEURL . '/wp-admin/';
+		if ( !headers_sent() ) {
-	elseif ( function_exists( 'get_bloginfo' ) && '' != get_bloginfo( 'wpurl' ) )
+			status_header( $r['response'] );
-		$admin_dir = get_bloginfo( 'wpurl' ) . '/wp-admin/';
+			nocache_headers();
-	elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false )
+			header( 'Content-Type: text/html; charset=utf-8' );
-		$admin_dir = '';
+		}
-	else
-		$admin_dir = 'wp-admin/';
+		if ( empty($title) )
+			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
-	if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) :
-	if( !headers_sent() ){
+		$text_direction = 'ltr';
-		status_header( $r['response'] );
+		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
-		nocache_headers();
+			$text_direction = 'rtl';
-		header( 'Content-Type: text/html; charset=utf-8' );
+		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
-	}
+			$text_direction = 'rtl';
-	if ( empty($title) ) {
-		$title = $have_gettext? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
-	}
-	$text_direction = 'ltr';
-	if ( isset($r['text_direction']) && $r['text_direction'] == 'rtl' ) $text_direction = 'rtl';
-	if ( ( $wp_locale ) && ( 'rtl' == $wp_locale->text_direction ) ) $text_direction = 'rtl';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
-<!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono -->
+<!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php echo $title ?></title>
-	<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" />
+	<style type="text/css">
-<?php
+		html {
-if ( 'rtl' == $text_direction ) : ?>
+			background: #f9f9f9;
-	<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install-rtl.css" type="text/css" />
+		}
-<?php endif; ?>
+		body {
+			background: #fff;
+			color: #333;
+			font-family: sans-serif;
+			margin: 2em auto;
+			padding: 1em 2em;
+			-webkit-border-radius: 3px;
+			border-radius: 3px;
+			border: 1px solid #dfdfdf;
+			max-width: 700px;
+		}
+		h1 {
+			border-bottom: 1px solid #dadada;
+			clear: both;
+			color: #666;
+			font: 24px Georgia, "Times New Roman", Times, serif;
+			margin: 30px 0 0 0;
+			padding: 0;
+			padding-bottom: 7px;
+		}
+		#error-page {
+			margin-top: 50px;
+		}
+		#error-page p {
+			font-size: 14px;
+			line-height: 1.5;
+			margin: 25px 0 20px;
+		}
+		#error-page code {
+			font-family: Consolas, Monaco, monospace;
+		}
+		ul li {
+			margin-bottom: 10px;
+			font-size: 14px ;
+		}
+		a {
+			color: #21759B;
+			text-decoration: none;
+		}
+		a:hover {
+			color: #D54E21;
+		}
+		.button {
+			font-family: sans-serif;
+			text-decoration: none;
+			font-size: 14px !important;
+			line-height: 16px;
+			padding: 6px 12px;
+			cursor: pointer;
+			border: 1px solid #bbb;
+			color: #464646;
+			-webkit-border-radius: 15px;
+			border-radius: 15px;
+			-moz-box-sizing: content-box;
+			-webkit-box-sizing: content-box;
+			box-sizing: content-box;
+			background-color: #f5f5f5;
+			background-image: -ms-linear-gradient(top, #ffffff, #f2f2f2);
+			background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+			background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+			background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f2f2f2));
+			background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+			background-image: linear-gradient(top, #ffffff, #f2f2f2);
+		}
+		.button:hover {
+			color: #000;
+			border-color: #666;
+		}
+		.button:active {
+			background-image: -ms-linear-gradient(top, #f2f2f2, #ffffff);
+			background-image: -moz-linear-gradient(top, #f2f2f2, #ffffff);
+			background-image: -o-linear-gradient(top, #f2f2f2, #ffffff);
+			background-image: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#ffffff));
+			background-image: -webkit-linear-gradient(top, #f2f2f2, #ffffff);
+			background-image: linear-gradient(top, #f2f2f2, #ffffff);
+		}
+		<?php if ( 'rtl' == $text_direction ) : ?>
+		body { font-family: Tahoma, Arial; }
+		<?php endif; ?>
+	</style>
 </head>
 <body id="error-page">
-<?php endif; ?>
+<?php endif; // ! did_action( 'admin_head' ) ?>
 	<?php echo $message; ?>
 </body>
 </html>
 <?php
 	die();
 }
 /**
+* Kill WordPress execution and display XML message with error message.
+*
+* This is the handler for wp_die when processing XMLRPC requests.
+*
+* @since 3.2.0
+* @access private
+*
+* @param string $message Error message.
+* @param string $title Error title.
+* @param string|array $args Optional arguments to control behavior.
+*/
+function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
+	global $wp_xmlrpc_server;
+	$defaults = array( 'response' => 500 );
+	$r = wp_parse_args($args, $defaults);
+	if ( $wp_xmlrpc_server ) {
+		$error = new IXR_Error( $r['response'] , $message);
+		$wp_xmlrpc_server->output( $error->getXml() );
+	}
+	die();
+}
+/**
+* Kill WordPress ajax execution.
+*
+* This is the handler for wp_die when processing Ajax requests.
+*
+* @since 3.4.0
+* @access private
+*
+* @param string $message Optional. Response to print.
+*/
+function _ajax_wp_die_handler( $message = '' ) {
+	if ( is_scalar( $message ) )
+		die( (string) $message );
+	die( '0' );
+}
+/**
+* Kill WordPress execution.
+*
+* This is the handler for wp_die when processing APP requests.
+*
+* @since 3.4.0
+* @access private
+*
+* @param string $message Optional. Response to print.
+*/
+function _scalar_wp_die_handler( $message = '' ) {
+	if ( is_scalar( $message ) )
+		die( (string) $message );
+	die();
+}
+/**
 * Retrieve the WordPress home page URL.
 *
-* If the constant named 'WP_HOME' exists, then it willl be used and returned by
+* If the constant named 'WP_HOME' exists, then it will be used and returned by
 * the function. This can be used to counter the redirection on your local
 * development environment.
 *
 * @access private
 * @package WordPress
 * @param string $url URL for the home location
 * @return string Homepage location.
 */
 function _config_wp_home( $url = '' ) {
 	if ( defined( 'WP_HOME' ) )
-		return WP_HOME;
+		return untrailingslashit( WP_HOME );
 	return $url;
 }
 /**
 * Retrieve the WordPress site URL.
 * @param string $url URL to set the WordPress site location.
 * @return string The WordPress Site URL
 */
 function _config_wp_siteurl( $url = '' ) {
 	if ( defined( 'WP_SITEURL' ) )
-		return WP_SITEURL;
+		return untrailingslashit( WP_SITEURL );
 	return $url;
 }
 /**
 * Set the localized direction for MCE plugin.
 *
 * @param array $input MCE plugin array.
 * @return array Direction set for 'rtl', if needed by locale.
 */
 function _mce_set_direction( $input ) {
-	global $wp_locale;
+	if ( is_rtl() ) {
-	if ( 'rtl' == $wp_locale->text_direction ) {
 		$input['directionality'] = 'rtl';
 		$input['plugins'] .= ',directionality';
 		$input['theme_advanced_buttons1'] .= ',ltr';
 	}
 	return $input;
 }
 /**
 * Convert smiley code to the icon graphic file equivalent.
 *
 * You can turn off smilies, by going to the write setting screen and unchecking
 		      ':-P' => 'icon_razz.gif',
 		      ':-o' => 'icon_surprised.gif',
 		      ':-x' => 'icon_mad.gif',
 		      ':-|' => 'icon_neutral.gif',
 		      ';-)' => 'icon_wink.gif',
-		       '8)' => 'icon_cool.gif',
+		// This one transformation breaks regular text with frequency.
+		//     '8)' => 'icon_cool.gif',
 		       '8O' => 'icon_eek.gif',
 		       ':(' => 'icon_sad.gif',
 		       ':)' => 'icon_smile.gif',
 		       ':?' => 'icon_confused.gif',
 		       ':D' => 'icon_biggrin.gif',
 		return array_merge( $defaults, $r );
 	return $r;
 }
 /**
-* Determines if default embed handlers should be loaded.
+* Clean up an array, comma- or space-separated list of IDs.
 *
-* Checks to make sure that the embeds library hasn't already been loaded. If
+* @since 3.0.0
-* it hasn't, then it will load the embeds library.
+*
-*
+* @param array|string $list
-* @since 2.9
+* @return array Sanitized array of IDs
 */
-function wp_maybe_load_embeds() {
+function wp_parse_id_list( $list ) {
-	if ( ! apply_filters('load_default_embeds', true) )
+	if ( !is_array($list) )
-		return;
+		$list = preg_split('/[\s,]+/', $list);
-	require_once( ABSPATH . WPINC . '/default-embeds.php' );
+	return array_unique(array_map('absint', $list));
+}
+/**
+* Extract a slice of an array, given a list of keys.
+*
+* @since 3.1.0
+*
+* @param array $array The original array
+* @param array $keys The list of keys
+* @return array The array slice
+*/
+function wp_array_slice_assoc( $array, $keys ) {
+	$slice = array();
+	foreach ( $keys as $key )
+		if ( isset( $array[ $key ] ) )
+			$slice[ $key ] = $array[ $key ];
+	return $slice;
+}
+/**
+* Filters a list of objects, based on a set of key => value arguments.
+*
+* @since 3.0.0
+*
+* @param array $list An array of objects to filter
+* @param array $args An array of key => value arguments to match against each object
+* @param string $operator The logical operation to perform. 'or' means only one element
+*	from the array needs to match; 'and' means all elements must match. The default is 'and'.
+* @param bool|string $field A field from the object to place instead of the entire object
+* @return array A list of objects or object fields
+*/
+function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
+	if ( ! is_array( $list ) )
+		return array();
+	$list = wp_list_filter( $list, $args, $operator );
+	if ( $field )
+		$list = wp_list_pluck( $list, $field );
+	return $list;
+}
+/**
+* Filters a list of objects, based on a set of key => value arguments.
+*
+* @since 3.1.0
+*
+* @param array $list An array of objects to filter
+* @param array $args An array of key => value arguments to match against each object
+* @param string $operator The logical operation to perform:
+*    'AND' means all elements from the array must match;
+*    'OR' means only one element needs to match;
+*    'NOT' means no elements may match.
+*   The default is 'AND'.
+* @return array
+*/
+function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
+	if ( ! is_array( $list ) )
+		return array();
+	if ( empty( $args ) )
+		return $list;
+	$operator = strtoupper( $operator );
+	$count = count( $args );
+	$filtered = array();
+	foreach ( $list as $key => $obj ) {
+		$to_match = (array) $obj;
+		$matched = 0;
+		foreach ( $args as $m_key => $m_value ) {
+			if ( $m_value == $to_match[ $m_key ] )
+				$matched++;
+		}
+		if ( ( 'AND' == $operator && $matched == $count )
+		  || ( 'OR' == $operator && $matched > 0 )
+		  || ( 'NOT' == $operator && 0 == $matched ) ) {
+			$filtered[$key] = $obj;
+		}
+	}
+	return $filtered;
+}
+/**
+* Pluck a certain field out of each object in a list.
+*
+* @since 3.1.0
+*
+* @param array $list A list of objects or arrays
+* @param int|string $field A field from the object to place instead of the entire object
+* @return array
+*/
+function wp_list_pluck( $list, $field ) {
+	foreach ( $list as $key => $value ) {
+		if ( is_object( $value ) )
+			$list[ $key ] = $value->$field;
+		else
+			$list[ $key ] = $value[ $field ];
+	}
+	return $list;
 }
 /**
 * Determines if Widgets library should be loaded.
 *
 * @since 2.2.0
 * @uses $submenu The administration submenu list.
 */
 function wp_widgets_add_menu() {
 	global $submenu;
-	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'switch_themes', 'widgets.php' );
+	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
 }
 /**
 * Flush all output buffers for PHP 5.2.
 	for ($i=0; $i<$levels; $i++)
 		ob_end_flush();
 }
 /**
-* Load the correct database class file.
-*
-* This function is used to load the database class file either at runtime or by
-* wp-admin/setup-config.php We must globalise $wpdb to ensure that it is
-* defined globally by the inline code in wp-db.php.
-*
-* @since 2.5.0
-* @global $wpdb WordPress Database Object
-*/
-function require_wp_db() {
-	global $wpdb;
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
-	else
-		require_once( ABSPATH . WPINC . '/wp-db.php' );
-}
-/**
 * Load custom DB error or display WordPress DB error.
 *
 * If a file exists in the wp-content directory named db-error.php, then it will
 * be loaded instead of displaying the WordPress DB error. If it is not found,
 * then the WordPress DB error will be displayed instead.
 	// Otherwise, be terse.
 	status_header( 500 );
 	nocache_headers();
 	header( 'Content-Type: text/html; charset=utf-8' );
+	wp_load_translations_early();
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Database Error</title>
+	<title><?php _e( 'Database Error' ); ?></title>
 </head>
 <body>
-	<h1>Error establishing a database connection</h1>
+	<h1><?php _e( 'Error establishing a database connection' ); ?></h1>
 </body>
 </html>
 <?php
 	die();
 }
 /**
 * Converts value to nonnegative integer.
 *
 * @since 2.5.0
 *
-* @param mixed $maybeint Data you wish to have convered to an nonnegative integer
+* @param mixed $maybeint Data you wish to have converted to a nonnegative integer
 * @return int An nonnegative integer
 */
 function absint( $maybeint ) {
 	return abs( intval( $maybeint ) );
 }
 * Determines if blog can be accessed over SSL by using cURL to access the site
 * using the https in the siteurl. Requires cURL extension to work correctly.
 *
 * @since 2.5.0
 *
-* @return bool Whether or not SSL access is available
+* @param string $url
+* @return bool Whether SSL access is available
 */
 function url_is_accessable_via_ssl($url)
 {
 	if (in_array('curl', get_loaded_extensions())) {
 		$ssl = preg_replace( '/^http:\/\//', 'https://',  $url );
 	}
 	return false;
 }
 /**
-* Secure URL, if available or the given URL.
-*
-* @since 2.5.0
-*
-* @param string $url Complete URL path with transport.
-* @return string Secure or regular URL path.
-*/
-function atom_service_url_filter($url)
-{
-	if ( url_is_accessable_via_ssl($url) )
-		return preg_replace( '/^http:\/\//', 'https://',  $url );
-	else
-		return $url;
-}
-/**
 * Marks a function as deprecated and informs when it has been used.
 *
 * There is a hook deprecated_function_run that will be called that can be used
 * to get the backtrace up to what file and function called the deprecated
 * function.
 *
-* The current behavior is to trigger an user error if WP_DEBUG is true.
+* The current behavior is to trigger a user error if WP_DEBUG is true.
 *
-* This function is to be used in every function in depreceated.php
+* This function is to be used in every function that is deprecated.
 *
 * @package WordPress
-* @package Debug
+* @subpackage Debug
 * @since 2.5.0
 * @access private
 *
-* @uses do_action() Calls 'deprecated_function_run' and passes the function name and what to use instead.
+* @uses do_action() Calls 'deprecated_function_run' and passes the function name, what to use instead,
-* @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
+*   and the version the function was deprecated in.
+* @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do
+*   trigger or false to not trigger error.
 *
 * @param string $function The function that was called
 * @param string $version The version of WordPress that deprecated the function
 * @param string $replacement Optional. The function that should have been called
 */
-function _deprecated_function($function, $version, $replacement=null) {
+function _deprecated_function( $function, $version, $replacement = null ) {
-	do_action('deprecated_function_run', $function, $replacement);
+	do_action( 'deprecated_function_run', $function, $replacement, $version );
 	// Allow plugin to filter the output error trigger
-	if( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true )) {
+	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
-		if( !is_null($replacement) )
+		if ( ! is_null($replacement) )
 			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
 		else
 			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
 	}
 }
 *
 * There is a hook deprecated_file_included that will be called that can be used
 * to get the backtrace up to what file and function included the deprecated
 * file.
 *
-* The current behavior is to trigger an user error if WP_DEBUG is true.
+* The current behavior is to trigger a user error if WP_DEBUG is true.
 *
-* This function is to be used in every file that is depreceated
+* This function is to be used in every file that is deprecated.
 *
 * @package WordPress
-* @package Debug
+* @subpackage Debug
 * @since 2.5.0
 * @access private
 *
-* @uses do_action() Calls 'deprecated_file_included' and passes the file name and what to use instead.
+* @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead,
-* @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
+*   the version in which the file was deprecated, and any message regarding the change.
+* @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do
+*   trigger or false to not trigger error.
 *
 * @param string $file The file that was included
-* @param string $version The version of WordPress that deprecated the function
+* @param string $version The version of WordPress that deprecated the file
-* @param string $replacement Optional. The function that should have been called
+* @param string $replacement Optional. The file that should have been included based on ABSPATH
-*/
+* @param string $message Optional. A message regarding the change
-function _deprecated_file($file, $version, $replacement=null) {
+*/
+function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
-	do_action('deprecated_file_included', $file, $replacement);
+	do_action( 'deprecated_file_included', $file, $replacement, $version, $message );
 	// Allow plugin to filter the output error trigger
-	if( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
+	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
-		if( !is_null($replacement) )
+		$message = empty( $message ) ? '' : ' ' . $message;
-			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
+		if ( ! is_null( $replacement ) )
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
 		else
-			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) );
+			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
 	}
 }
+/**
-/**
+* Marks a function argument as deprecated and informs when it has been used.
-* Is the server running earlier than 1.5.0 version of lighttpd
+*
+* This function is to be used whenever a deprecated function argument is used.
+* Before this function is called, the argument must be checked for whether it was
+* used by comparing it to its default value or evaluating whether it is empty.
+* For example:
+* <code>
+* if ( !empty($deprecated) )
+* 	_deprecated_argument( __FUNCTION__, '3.0' );
+* </code>
+*
+* There is a hook deprecated_argument_run that will be called that can be used
+* to get the backtrace up to what file and function used the deprecated
+* argument.
+*
+* The current behavior is to trigger a user error if WP_DEBUG is true.
+*
+* @package WordPress
+* @subpackage Debug
+* @since 3.0.0
+* @access private
+*
+* @uses do_action() Calls 'deprecated_argument_run' and passes the function name, a message on the change,
+*   and the version in which the argument was deprecated.
+* @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do
+*   trigger or false to not trigger error.
+*
+* @param string $function The function that was called
+* @param string $version The version of WordPress that deprecated the argument used
+* @param string $message Optional. A message regarding the change.
+*/
+function _deprecated_argument( $function, $version, $message = null ) {
+	do_action( 'deprecated_argument_run', $function, $message, $version );
+	// Allow plugin to filter the output error trigger
+	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
+		if ( ! is_null( $message ) )
+			trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+		else
+			trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+	}
+}
+/**
+* Marks something as being incorrectly called.
+*
+* There is a hook doing_it_wrong_run that will be called that can be used
+* to get the backtrace up to what file and function called the deprecated
+* function.
+*
+* The current behavior is to trigger a user error if WP_DEBUG is true.
+*
+* @package WordPress
+* @subpackage Debug
+* @since 3.1.0
+* @access private
+*
+* @uses do_action() Calls 'doing_it_wrong_run' and passes the function arguments.
+* @uses apply_filters() Calls 'doing_it_wrong_trigger_error' and expects boolean value of true to do
+*   trigger or false to not trigger error.
+*
+* @param string $function The function that was called.
+* @param string $message A message explaining what has been done incorrectly.
+* @param string $version The version of WordPress where the message was added.
+*/
+function _doing_it_wrong( $function, $message, $version ) {
+	do_action( 'doing_it_wrong_run', $function, $message, $version );
+	// Allow plugin to filter the output error trigger
+	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
+		$version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
+		$message .= ' ' . __( 'Please see <a href="http://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.' );
+		trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+	}
+}
+/**
+* Is the server running earlier than 1.5.0 version of lighttpd?
 *
 * @since 2.5.0
 *
 * @return bool Whether the server is running lighttpd < 1.5.0
 */
 	$server_parts[1] = isset( $server_parts[1] )? $server_parts[1] : '';
 	return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
 }
 /**
-* Does the specified module exist in the apache config?
+* Does the specified module exist in the Apache config?
 *
 * @since 2.5.0
 *
 * @param string $mod e.g. mod_rewrite
 * @param bool $default The default return value if the module is not found
 	}
 	return $default;
 }
 /**
+* Check if IIS 7 supports pretty permalinks.
+*
+* @since 2.8.0
+*
+* @return bool
+*/
+function iis7_supports_permalinks() {
+	global $is_iis7;
+	$supports_permalinks = false;
+	if ( $is_iis7 ) {
+		/* First we check if the DOMDocument class exists. If it does not exist,
+		 * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
+		 * hence we just bail out and tell user that pretty permalinks cannot be used.
+		 * This is not a big issue because PHP 4.X is going to be deprecated and for IIS it
+		 * is recommended to use PHP 5.X NTS.
+		 * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
+		 * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
+		 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
+		 * via ISAPI then pretty permalinks will not work.
+		 */
+		$supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
+	}
+	return apply_filters('iis7_supports_permalinks', $supports_permalinks);
+}
+/**
 * File validates against allowed set of defined rules.
 *
 * A return value of '1' means that the $file contains either '..' or './'. A
 * return value of '2' means that the $file contains ':' after the first
 * character. A return value of '3' means that the file is not in the allowed
 * @param string $file File path.
 * @param array $allowed_files List of allowed files.
 * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
 */
 function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ))
+	if ( false !== strpos( $file, '..' ) )
 		return 1;
-	if ( false !== strpos( $file, './' ))
+	if ( false !== strpos( $file, './' ) )
 		return 1;
-	if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
 		return 3;
-	if (':' == substr( $file, 1, 1 ))
+	if (':' == substr( $file, 1, 1 ) )
 		return 2;
 	return 0;
 }
 	return $forced;
 }
 /**
-* Whether to force SSL used for the Administration Panels.
+* Whether to force SSL used for the Administration Screens.
 *
 * @since 2.6.0
 *
 * @param string|bool $force
 * @return bool True if forced, false if not forced.
 */
 function wp_guess_url() {
 	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
 		$url = WP_SITEURL;
 	} else {
-		$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+		$schema = is_ssl() ? 'https://' : 'http://';
-		$url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+		$url = preg_replace('#/(wp-admin/.*|wp-login.php)#i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
 	}
-	return $url;
+	return rtrim($url, '/');
+}
+/**
+* Temporarily suspend cache additions.
+*
+* Stops more data being added to the cache, but still allows cache retrieval.
+* This is useful for actions, such as imports, when a lot of data would otherwise
+* be almost uselessly added to the cache.
+*
+* Suspension lasts for a single page load at most. Remember to call this
+* function again if you wish to re-enable cache adds earlier.
+*
+* @since 3.3.0
+*
+* @param bool $suspend Optional. Suspends additions if true, re-enables them if false.
+* @return bool The current suspend setting
+*/
+function wp_suspend_cache_addition( $suspend = null ) {
+	static $_suspend = false;
+	if ( is_bool( $suspend ) )
+		$_suspend = $suspend;
+	return $_suspend;
 }
 /**
 * Suspend cache invalidation.
 *
-* Turns cache invalidation on and off.  Useful during imports where you don't wont to do invalidations
+* Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations
-* every time a post is inserted.  Callers must be sure that what they are doing won't lead to an inconsistent
+* every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent
 * cache when invalidation is suspended.
 *
 * @since 2.7.0
 *
 * @param bool $suspend Whether to suspend or enable cache invalidation
 	$current_suspend = $_wp_suspend_cache_invalidation;
 	$_wp_suspend_cache_invalidation = $suspend;
 	return $current_suspend;
 }
-function get_site_option( $key, $default = false, $use_cache = true ) {
+/**
-	// Allow plugins to short-circuit site options.
+* Is main site?
-	$pre = apply_filters( 'pre_site_option_' . $key, false );
+*
-	if ( false !== $pre )
+*
-		return $pre;
+* @since 3.0.0
-	$value = get_option($key, $default);
-	return apply_filters( 'site_option_' . $key, $value );
-}
-// expects $key, $value not to be SQL escaped
-function add_site_option( $key, $value ) {
-	$value = apply_filters( 'pre_add_site_option_' . $key, $value );
-	$result =  add_option($key, $value);
-	do_action( "add_site_option_{$key}", $key, $value );
-	return $result;
-}
-function delete_site_option( $key ) {
-	$result = delete_option($key);
-	do_action( "delete_site_option_{$key}", $key );
-	return $result;
-}
-// expects $key, $value not to be SQL escaped
-function update_site_option( $key, $value ) {
-	$oldvalue = get_site_option( $key );
-	$value = apply_filters( 'pre_update_site_option_' . $key, $value, $oldvalue );
-	$result = update_option($key, $value);
-	do_action( "update_site_option_{$key}", $key, $value );
-	return $result;
-}
-/**
-* Delete a site transient
-*
-* @since 2.890
 * @package WordPress
-* @subpackage Transient
+*
-*
+* @param int $blog_id optional blog id to test (default current blog)
-* @param string $transient Transient name. Expected to not be SQL-escaped
+* @return bool True if not multisite or $blog_id is main site
-* @return bool true if successful, false otherwise
+*/
-*/
+function is_main_site( $blog_id = '' ) {
-function delete_site_transient($transient) {
+	global $current_site, $current_blog;
-	global $_wp_using_ext_object_cache, $wpdb;
+	if ( !is_multisite() )
-	if ( $_wp_using_ext_object_cache ) {
+		return true;
-		return wp_cache_delete($transient, 'site-transient');
-	} else {
+	if ( !$blog_id )
-		$transient = '_site_transient_' . esc_sql($transient);
+		$blog_id = $current_blog->blog_id;
-		return delete_site_option($transient);
-	}
+	return $blog_id == $current_site->blog_id;
 }
 /**
-* Get the value of a site transient
+* Whether global terms are enabled.
 *
-* If the transient does not exist or does not have a value, then the return value
+*
-* will be false.
+* @since 3.0.0
-*
-* @since 2.9.0
 * @package WordPress
-* @subpackage Transient
+*
-*
+* @return bool True if multisite and global terms enabled
-* @param string $transient Transient name. Expected to not be SQL-escaped
+*/
-* @return mixed Value of transient
+function global_terms_enabled() {
-*/
+	if ( ! is_multisite() )
-function get_site_transient($transient) {
+		return false;
-	global $_wp_using_ext_object_cache, $wpdb;
+	static $global_terms = null;
-	$pre = apply_filters( 'pre_site_transient_' . $transient, false );
+	if ( is_null( $global_terms ) ) {
-	if ( false !== $pre )
+		$filter = apply_filters( 'global_terms_enabled', null );
-		return $pre;
+		if ( ! is_null( $filter ) )
+			$global_terms = (bool) $filter;
-	if ( $_wp_using_ext_object_cache ) {
+		else
-		$value = wp_cache_get($transient, 'site-transient');
+			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
-	} else {
+	}
-		$transient_option = '_site_transient_' . esc_sql($transient);
+	return $global_terms;
-		$transient_timeout = '_site_transient_timeout_' . esc_sql($transient);
+}
-		if ( get_site_option($transient_timeout) < time() ) {
-			delete_site_option($transient_option);
+/**
-			delete_site_option($transient_timeout);
+* gmt_offset modification for smart timezone handling.
-			return false;
+*
-		}
+* Overrides the gmt_offset option if we have a timezone_string available.
+*
-		$value = get_site_option($transient_option);
+* @since 2.8.0
-	}
+*
+* @return float|bool
-	return apply_filters('site_transient_' . $transient, $value);
-}
-/**
-* Set/update the value of a site transient
-*
-* You do not need to serialize values, if the value needs to be serialize, then
-* it will be serialized before it is set.
-*
-* @since 2.9.0
-* @package WordPress
-* @subpackage Transient
-*
-* @param string $transient Transient name. Expected to not be SQL-escaped
-* @param mixed $value Transient value.
-* @param int $expiration Time until expiration in seconds, default 0
-* @return bool False if value was not set and true if value was set.
-*/
-function set_site_transient($transient, $value, $expiration = 0) {
-	global $_wp_using_ext_object_cache, $wpdb;
-	if ( $_wp_using_ext_object_cache ) {
-		return wp_cache_set($transient, $value, 'site-transient', $expiration);
-	} else {
-		$transient_timeout = '_site_transient_timeout_' . $transient;
-		$transient = '_site_transient_' . $transient;
-		$safe_transient = esc_sql($transient);
-		if ( false === get_site_option( $safe_transient ) ) {
-			if ( 0 != $expiration )
-				add_site_option($transient_timeout, time() + $expiration);
-			return add_site_option($transient, $value);
-		} else {
-			if ( 0 != $expiration )
-				update_site_option($transient_timeout, time() + $expiration);
-			return update_site_option($transient, $value);
-		}
-	}
-}
-/**
-* gmt_offset modification for smart timezone handling
-*
-* Overrides the gmt_offset option if we have a timezone_string available
 */
 function wp_timezone_override_offset() {
-	if ( !wp_timezone_supported() ) {
-		return false;
-	}
 	if ( !$timezone_string = get_option( 'timezone_string' ) ) {
 		return false;
 	}
-	@date_default_timezone_set( $timezone_string );
 	$timezone_object = timezone_open( $timezone_string );
 	$datetime_object = date_create();
 	if ( false === $timezone_object || false === $datetime_object ) {
 		return false;
 	}
 	return round( timezone_offset_get( $timezone_object, $datetime_object ) / 3600, 2 );
 }
 /**
-* Check for PHP timezone support
+* {@internal Missing Short Description}}
-*/
+*
-function wp_timezone_supported() {
+* @since 2.9.0
-	$support = false;
+*
-	if (
+* @param unknown_type $a
-		function_exists( 'date_default_timezone_set' ) &&
+* @param unknown_type $b
-		function_exists( 'timezone_identifiers_list' ) &&
+* @return int
-		function_exists( 'timezone_open' ) &&
+*/
-		function_exists( 'timezone_offset_get' )
-	) {
-		$support = true;
-	}
-	return apply_filters( 'timezone_support', $support );
-}
 function _wp_timezone_choice_usort_callback( $a, $b ) {
 	// Don't use translated versions of Etc
 	if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {
 		// Make the order of these more like the old dropdown
 		if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {
 		return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
 	}
 }
 /**
-* Gives a nicely formatted list of timezone strings // temporary! Not in final
+* Gives a nicely formatted list of timezone strings. // temporary! Not in final
 *
-* @param $selected_zone string Selected Zone
+* @since 2.9.0
 *
+* @param string $selected_zone Selected Zone
+* @return string
 */
 function wp_timezone_choice( $selected_zone ) {
 	static $mo_loaded = false;
 	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
 			continue;
 		}
 		// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
 		$exists = array(
-			0 => ( isset( $zone[0] ) && $zone[0] ) ? true : false,
+			0 => ( isset( $zone[0] ) && $zone[0] ),
-			1 => ( isset( $zone[1] ) && $zone[1] ) ? true : false,
+			1 => ( isset( $zone[1] ) && $zone[1] ),
-			2 => ( isset( $zone[2] ) && $zone[2] ) ? true : false
+			2 => ( isset( $zone[2] ) && $zone[2] ),
 		);
-		$exists[3] = ( $exists[0] && 'Etc' !== $zone[0] ) ? true : false;
+		$exists[3] = ( $exists[0] && 'Etc' !== $zone[0] );
-		$exists[4] = ( $exists[1] && $exists[3] ) ? true : false;
+		$exists[4] = ( $exists[1] && $exists[3] );
-		$exists[5] = ( $exists[2] && $exists[3] ) ? true : false;
+		$exists[5] = ( $exists[2] && $exists[3] );
 		$zonen[] = array(
 			'continent'   => ( $exists[0] ? $zone[0] : '' ),
 			'city'        => ( $exists[1] ? $zone[1] : '' ),
 			'subcity'     => ( $exists[2] ? $zone[2] : '' ),
 		$offset_value = 'UTC' . $offset_value;
 		$selected = '';
 		if ( $offset_value === $selected_zone )
 			$selected = 'selected="selected" ';
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 	}
 	$structure[] = '</optgroup>';
 	return join( "\n", $structure );
 }
 /**
-* Strip close comment and close php tags from file headers used by WP
+* Strip close comment and close php tags from file headers used by WP.
 * See http://core.trac.wordpress.org/ticket/8497
 *
-* @since 2.8
+* @since 2.8.0
-**/
+*
+* @param string $str
+* @return string
+*/
 function _cleanup_header_comment($str) {
 	return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str));
 }
 /**
 * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
 *
 * @since 2.9.0
-*
-* @return void
 */
 function wp_scheduled_delete() {
 	global $wpdb;
 	$delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
 		}
 	}
 }
 /**
-* Parse the file contents to retrieve its metadata.
+* Retrieve metadata from a file.
 *
-* Searches for metadata for a file, such as a plugin or theme.  Each piece of
+* Searches for metadata in the first 8kiB of a file, such as a plugin or theme.
-* metadata must be on its own line. For a field spanning multple lines, it
+* Each piece of metadata must be on its own line. Fields can not span multiple
-* must not have any newlines or only parts of it will be displayed.
+* lines, the value will get cut at the end of the first line.
 *
-* Some users have issues with opening large files and manipulating the contents
+* If the file data is not within that first 8kiB, then the author should correct
-* for want is usually the first 1kiB or 2kiB. This function stops pulling in
+* their plugin file and move the data headers to the top.
-* the file contents when it has all of the required data.
+*
-*
+* @see http://codex.wordpress.org/File_Header
-* The first 8kiB of the file will be pulled in and if the file data is not
-* within that first 8kiB, then the author should correct their plugin file
-* and move the data headers to the top.
-*
-* The file is assumed to have permissions to allow for scripts to read
-* the file. This is not checked however and the file is only opened for
-* reading.
 *
 * @since 2.9.0
-*
 * @param string $file Path to the file
-* @param bool $markup If the returned data should have HTML markup applied
+* @param array $default_headers List of headers, in the format array('HeaderKey' => 'Header Name')
-* @param string $context If specified adds filter hook "extra_<$context>_headers"
+* @param string $context If specified adds filter hook "extra_{$context}_headers"
 */
 function get_file_data( $file, $default_headers, $context = '' ) {
 	// We don't need to write to the file, so just open for reading.
 	$fp = fopen( $file, 'r' );
 	$file_data = fread( $fp, 8192 );
 	// PHP will close file handle, but we are good citizens.
 	fclose( $fp );
-	if( $context != '' ) {
+	// Make sure we catch CR-only line endings.
-		$extra_headers = apply_filters( "extra_$context".'_headers', array() );
+	$file_data = str_replace( "\r", "\n", $file_data );
-		$extra_headers = array_flip( $extra_headers );
+	if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
-		foreach( $extra_headers as $key=>$value ) {
+		$extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
-			$extra_headers[$key] = $key;
+		$all_headers = array_merge( $extra_headers, (array) $default_headers );
-		}
-		$all_headers = array_merge($extra_headers, $default_headers);
 	} else {
 		$all_headers = $default_headers;
 	}
 	foreach ( $all_headers as $field => $regex ) {
-		preg_match( '/' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field});
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-		if ( !empty( ${$field} ) )
+			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-			${$field} = _cleanup_header_comment( ${$field}[1] );
 		else
-			${$field} = '';
+			$all_headers[ $field ] = '';
 	}
-	$file_data = compact( array_keys( $all_headers ) );
+	return $all_headers;
+}
-	return $file_data;
-}
+/**
-/*
+* Used internally to tidy up the search terms.
-* Used internally to tidy up the search terms
+*
-*
+* @access private
-* @private
 * @since 2.9.0
+*
+* @param string $t
+* @return string
 */
 function _search_terms_tidy($t) {
-	return trim($t, "\"\'\n\r ");
+	return trim($t, "\"'\n\r ");
 }
-?>
+/**
+* Returns true.
+*
+* Useful for returning true to filters easily.
+*
+* @since 3.0.0
+* @see __return_false()
+* @return bool true
+*/
+function __return_true() {
+	return true;
+}
+/**
+* Returns false.
+*
+* Useful for returning false to filters easily.
+*
+* @since 3.0.0
+* @see __return_true()
+* @return bool false
+*/
+function __return_false() {
+	return false;
+}
+/**
+* Returns 0.
+*
+* Useful for returning 0 to filters easily.
+*
+* @since 3.0.0
+* @see __return_zero()
+* @return int 0
+*/
+function __return_zero() {
+	return 0;
+}
+/**
+* Returns an empty array.
+*
+* Useful for returning an empty array to filters easily.
+*
+* @since 3.0.0
+* @see __return_zero()
+* @return array Empty array
+*/
+function __return_empty_array() {
+	return array();
+}
+/**
+* Returns null.
+*
+* Useful for returning null to filters easily.
+*
+* @since 3.4.0
+* @return null
+*/
+function __return_null() {
+	return null;
+}
+/**
+* Send a HTTP header to disable content type sniffing in browsers which support it.
+*
+* @link http://blogs.msdn.com/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx
+* @link http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
+*
+* @since 3.0.0
+* @return none
+*/
+function send_nosniff_header() {
+	@header( 'X-Content-Type-Options: nosniff' );
+}
+/**
+* Returns a MySQL expression for selecting the week number based on the start_of_week option.
+*
+* @internal
+* @since 3.0.0
+* @param string $column
+* @return string
+*/
+function _wp_mysql_week( $column ) {
+	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
+	default :
+	case 0 :
+		return "WEEK( $column, 0 )";
+	case 1 :
+		return "WEEK( $column, 1 )";
+	case 2 :
+	case 3 :
+	case 4 :
+	case 5 :
+	case 6 :
+		return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+	}
+}
+/**
+* Finds hierarchy loops using a callback function that maps object IDs to parent IDs.
+*
+* @since 3.1.0
+* @access private
+*
+* @param callback $callback function that accepts ( ID, $callback_args ) and outputs parent_ID
+* @param int $start The ID to start the loop check at
+* @param int $start_parent the parent_ID of $start to use instead of calling $callback( $start ). Use null to always use $callback
+* @param array $callback_args optional additional arguments to send to $callback
+* @return array IDs of all members of loop
+*/
+function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
+	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
+	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
+		return array();
+	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
+}
+/**
+* Uses the "The Tortoise and the Hare" algorithm to detect loops.
+*
+* For every step of the algorithm, the hare takes two steps and the tortoise one.
+* If the hare ever laps the tortoise, there must be a loop.
+*
+* @since 3.1.0
+* @access private
+*
+* @param callback $callback function that accepts ( ID, callback_arg, ... ) and outputs parent_ID
+* @param int $start The ID to start the loop check at
+* @param array $override an array of ( ID => parent_ID, ... ) to use instead of $callback
+* @param array $callback_args optional additional arguments to send to $callback
+* @param bool $_return_loop Return loop members or just detect presence of loop?
+*             Only set to true if you already know the given $start is part of a loop
+*             (otherwise the returned array might include branches)
+* @return mixed scalar ID of some arbitrary member of the loop, or array of IDs of all members of loop if $_return_loop
+*/
+function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = array(), $callback_args = array(), $_return_loop = false ) {
+	$tortoise = $hare = $evanescent_hare = $start;
+	$return = array();
+	// Set evanescent_hare to one past hare
+	// Increment hare two steps
+	while (
+		$tortoise
+	&&
+		( $evanescent_hare = isset( $override[$hare] ) ? $override[$hare] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
+	&&
+		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
+	) {
+		if ( $_return_loop )
+			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		// tortoise got lapped - must be a loop
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
+			return $_return_loop ? $return : $tortoise;
+		// Increment tortoise by one step
+		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
+	}
+	return false;
+}
+/**
+* Send a HTTP header to limit rendering of pages to same origin iframes.
+*
+* @link https://developer.mozilla.org/en/the_x-frame-options_response_header
+*
+* @since 3.1.3
+* @return none
+*/
+function send_frame_options_header() {
+	@header( 'X-Frame-Options: SAMEORIGIN' );
+}
+/**
+* Retrieve a list of protocols to allow in HTML attributes.
+*
+* @since 3.3.0
+* @see wp_kses()
+* @see esc_url()
+*
+* @return array Array of allowed protocols
+*/
+function wp_allowed_protocols() {
+	static $protocols;
+	if ( empty( $protocols ) ) {
+		$protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn' );
+		$protocols = apply_filters( 'kses_allowed_protocols', $protocols );
+	}
+	return $protocols;
+}
+/**
+* Return a comma separated string of functions that have been called to get to the current point in code.
+*
+* @link http://core.trac.wordpress.org/ticket/19589
+* @since 3.4
+*
+* @param string $ignore_class A class to ignore all function calls within - useful when you want to just give info about the callee
+* @param int $skip_frames A number of stack frames to skip - useful for unwinding back to the source of the issue
+* @param bool $pretty Whether or not you want a comma separated string or raw array returned
+* @return string|array Either a string containing a reversed comma separated trace or an array of individual calls.
+*/
+function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
+		$trace = debug_backtrace( false );
+	else
+		$trace = debug_backtrace();
+	$caller = array();
+	$check_class = ! is_null( $ignore_class );
+	$skip_frames++; // skip this function
+	foreach ( $trace as $call ) {
+		if ( $skip_frames > 0 ) {
+			$skip_frames--;
+		} elseif ( isset( $call['class'] ) ) {
+			if ( $check_class && $ignore_class == $call['class'] )
+				continue; // Filter out calls
+			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
+		} else {
+			if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
+				$caller[] = "{$call['function']}('{$call['args'][0]}')";
+			} elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
+				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+			} else {
+				$caller[] = $call['function'];
+			}
+		}
+	}
+	if ( $pretty )
+		return join( ', ', array_reverse( $caller ) );
+	else
+		return $caller;
+}
+/**
+* Retrieve ids that are not already present in the cache
+*
+* @since 3.4.0
+*
+* @param array $object_ids ID list
+* @param string $cache_key The cache bucket to check against
+*
+* @return array
+*/
+function _get_non_cached_ids( $object_ids, $cache_key ) {
+	$clean = array();
+	foreach ( $object_ids as $id ) {
+		$id = (int) $id;
+		if ( !wp_cache_get( $id, $cache_key ) ) {
+			$clean[] = $id;
+		}
+	}
+	return $clean;
+}
+/**
+* Test if the current device has the capability to upload files.
+*
+* @since 3.4.0
+* @access private
+*
+* @return bool true|false
+*/
+function _device_can_upload() {
+	if ( ! wp_is_mobile() )
+		return true;
+	$ua = $_SERVER['HTTP_USER_AGENT'];
+	if ( strpos($ua, 'iPhone') !== false
+		|| strpos($ua, 'iPad') !== false
+		|| strpos($ua, 'iPod') !== false ) {
+			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
+	} else {
+		return true;
+	}
+}

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b