X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/98a4d31e52bd56c908617df281730bd4ba58d110..542cf06a610bc430421351ace7a2cc45f393b990:/wp-admin/includes/misc.php

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 356c6b00..1ecb3a05 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -120,12 +120,15 @@ function insert_with_markers( $filename, $marker, $insertion ) {
  * @since unknown
  */
 function save_mod_rewrite_rules() {
+	if ( is_multisite() )
+		return;
+
 	global $wp_rewrite;
 
 	$home_path = get_home_path();
 	$htaccess_file = $home_path.'.htaccess';
 
-	// If the file doesn't already exists check for write access to the directory and whether of not we have some rules.
+	// If the file doesn't already exist check for write access to the directory and whether we have some rules.
 	// else check for write access to the file.
 	if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
 		if ( got_mod_rewrite() ) {
@@ -154,7 +157,7 @@ function iis7_save_url_rewrite_rules(){
 	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
 	if ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) {
 		if ( iis7_supports_permalinks() ) {
-			$rule = $wp_rewrite->iis7_url_rewrite_rules();
+			$rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
 			if ( ! empty($rule) ) {
 				return iis7_add_rewrite_rule($web_config_file, $rule);
 			} else {
@@ -227,26 +230,28 @@ function url_shorten( $url ) {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Resets global variables based on $_GET and $_POST
+ *
+ * This function resets global variables based on the names passed
+ * in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
+ * if neither is defined.
  *
  * @since unknown
  *
- * @param unknown_type $vars
+ * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
 	for ( $i=0; $i<count( $vars ); $i += 1 ) {
 		$var = $vars[$i];
 		global $$var;
 
-		if (!isset( $$var ) ) {
-			if ( empty( $_POST["$var"] ) ) {
-				if ( empty( $_GET["$var"] ) )
-					$$var = '';
-				else
-					$$var = $_GET["$var"];
-			} else {
-				$$var = $_POST["$var"];
-			}
+		if ( empty( $_POST[$var] ) ) {
+			if ( empty( $_GET[$var] ) )
+				$$var = '';
+			else
+				$$var = $_GET[$var];
+		} else {
+			$$var = $_POST[$var];
 		}
 	}
 }
@@ -259,13 +264,15 @@ function wp_reset_vars( $vars ) {
  * @param unknown_type $message
  */
 function show_message($message) {
-	if( is_wp_error($message) ){
-		if( $message->get_error_data() )
+	if ( is_wp_error($message) ){
+		if ( $message->get_error_data() )
 			$message = $message->get_error_message() . ': ' . $message->get_error_data();
 		else
 			$message = $message->get_error_message();
 	}
 	echo "<p>$message</p>\n";
+	wp_ob_end_flush_all();
+	flush();
 }
 
 function wp_doc_link_parse( $content ) {
@@ -305,76 +312,6 @@ function wp_doc_link_parse( $content ) {
 	return $out;
 }
 
-/**
- * Determines the language to use for CodePress syntax highlighting,
- * based only on a filename.
- *
- * @since 2.8
- *
- * @param string $filename The name of the file to be highlighting
-**/
-function codepress_get_lang( $filename ) {
-	$codepress_supported_langs = apply_filters( 'codepress_supported_langs',
-									array( '.css' => 'css',
-											'.js' => 'javascript',
-											'.php' => 'php',
-											'.html' => 'html',
-											'.htm' => 'html',
-											'.txt' => 'text'
-											) );
-	$extension = substr( $filename, strrpos( $filename, '.' ) );
-	if ( $extension && array_key_exists( $extension, $codepress_supported_langs ) )
-		return $codepress_supported_langs[$extension];
-
-	return 'generic';
-}
-
-/**
- * Adds Javascript required to make CodePress work on the theme/plugin editors.
- *
- * This code is attached to the action admin_print_footer_scripts.
- *
- * @since 2.8
-**/
-function codepress_footer_js() {
-	// Script-loader breaks CP's automatic path-detection, thus CodePress.path
-	// CP edits in an iframe, so we need to grab content back into normal form
-	?><script type="text/javascript">
-/* <![CDATA[ */
-var codepress_path = '<?php echo includes_url('js/codepress/'); ?>';
-jQuery('#template').submit(function(){
-	if (jQuery('#newcontent_cp').length)
-		jQuery('#newcontent_cp').val(newcontent.getCode()).removeAttr('disabled');
-});
-jQuery('#codepress-on').hide();
-jQuery('#codepress-off').show();
-/* ]]> */
-</script>
-<?php
-}
-
-/**
- * Determine whether to use CodePress or not.
- *
- * @since 2.8
-**/
-function use_codepress() {
-
-	if ( isset($_GET['codepress']) ) {
-		$on = 'on' == $_GET['codepress'] ? 'on' : 'off';
-		set_user_setting( 'codepress', $on );
-	} else {
-		$on = get_user_setting('codepress', 'on');
-	}
-
-	if ( 'on' == $on ) {
-		add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
-		return true;
-	}
-
-	return false;
-}
-
 /**
  * Saves option for number of rows when listing posts, pages, comments, etc.
  *
@@ -395,12 +332,21 @@ function set_screen_options() {
 
 		$option = str_replace('-', '_', $option);
 
-		switch ( $option ) {
+		$map_option = $option;
+		$type = str_replace('edit_', '', $map_option);
+		$type = str_replace('_per_page', '', $type);
+		if ( in_array($type, get_post_types()) )
+			$map_option = 'edit_per_page';
+		if ( in_array( $type, get_taxonomies()) )
+			$map_option = 'edit_tags_per_page';
+
+
+		switch ( $map_option ) {
 			case 'edit_per_page':
-			case 'edit_pages_per_page':
+			case 'ms_sites_per_page':
+			case 'ms_users_per_page':
 			case 'edit_comments_per_page':
 			case 'upload_per_page':
-			case 'categories_per_page':
 			case 'edit_tags_per_page':
 			case 'plugins_per_page':
 				$value = (int) $value;
@@ -414,7 +360,7 @@ function set_screen_options() {
 				break;
 		}
 
-		update_usermeta($user->ID, $option, $value);
+		update_user_meta($user->ID, $option, $value);
 		wp_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
 		exit;
 	}
@@ -474,7 +420,7 @@ function iis7_rewrite_rule_exists($filename) {
 	if ( $doc->load($filename) === false )
 		return false;
 	$xpath = new DOMXPath($doc);
-	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 	if ( $rules->length == 0 )
 		return false;
 	else
@@ -503,7 +449,7 @@ function iis7_delete_rewrite_rule($filename) {
 	if ( $doc -> load($filename) === false )
 		return false;
 	$xpath = new DOMXPath($doc);
-	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 	if ( $rules->length > 0 ) {
 		$child = $rules->item(0);
 		$parent = $child->parentNode;
@@ -543,7 +489,7 @@ function iis7_add_rewrite_rule($filename, $rewrite_rule) {
 	$xpath = new DOMXPath($doc);
 
 	// First check if the rule already exists as in that case there is no need to re-add it
-	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 	if ( $wordpress_rules->length > 0 )
 		return true;
 
@@ -587,6 +533,7 @@ function iis7_add_rewrite_rule($filename, $rewrite_rule) {
 	$rule_fragment->appendXML($rewrite_rule);
 	$rules_node->appendChild($rule_fragment);
 
+	$doc->encoding = "UTF-8";
 	$doc->formatOutput = true;
 	saveDomDocument($doc, $filename);
 
@@ -638,4 +585,33 @@ function win_is_writable($path) {
         unlink($path);
     return true;
 }
+
+/**
+ * Display the default admin color scheme picker (Used in user-edit.php)
+ *
+ * @since 3.0.0
+ */
+function admin_color_scheme_picker() {
+	global $_wp_admin_css_colors, $user_id; ?>
+<fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend>
+<?php
+$current_color = get_user_option('admin_color', $user_id);
+if ( empty($current_color) )
+	$current_color = 'fresh';
+foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
+<div class="color-option"><input name="admin_color" id="admin_color_<?php echo $color; ?>" type="radio" value="<?php echo esc_attr($color) ?>" class="tog" <?php checked($color, $current_color); ?> />
+	<table class="color-palette">
+	<tr>
+	<?php foreach ( $color_info->colors as $html_color ): ?>
+	<td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&nbsp;</td>
+	<?php endforeach; ?>
+	</tr>
+	</table>
+
+	<label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
+</div>
+	<?php endforeach; ?>
+</fieldset>
+<?php
+}
 ?>