From 5c18ec70f6e2fbbb51ba243557a9f1388f8d69b2 Mon Sep 17 00:00:00 2001
From: Ron Rennick <wpmuguru@git.wordpress.org>
Date: Mon, 15 Mar 2010 17:32:34 +0000
Subject: [PATCH] suppress htaccess update message in multisite, props ocean90,
 fixes #12604

git-svn-id: https://develop.svn.wordpress.org/trunk@13706 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/options-permalink.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 4a7007dd72..4c91aa730f 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -131,22 +131,26 @@ else
 	$usingpi = false;
 
 $wp_rewrite->flush_rules();
-?>
 
-<?php if (isset($_POST['submit'])) : ?>
+
+if (isset($_POST['submit'])) : ?>
 <div id="message" class="updated"><p><?php
-if ( $iis7_permalinks ) {
-	if ( $permalink_structure && ! $usingpi && ! $writable )
-		_e('You should update your web.config now');
-	else if ( $permalink_structure && ! $usingpi && $writable)
-		_e('Permalink structure updated. Remove write access on web.config file now!');
-	else
-		_e('Permalink structure updated');
+if ( ! is_multisite() ) {
+	if ( $iis7_permalinks ) {
+		if ( $permalink_structure && ! $usingpi && ! $writable )
+			_e('You should update your web.config now');
+		else if ( $permalink_structure && ! $usingpi && $writable )
+			_e('Permalink structure updated. Remove write access on web.config file now!');
+		else
+			_e('Permalink structure updated');
+	} else {
+		if ( $permalink_structure && ! $usingpi && ! $writable )
+			_e('You should update your .htaccess now.');
+		else
+			_e('Permalink structure updated.');
+	}
 } else {
-	if ( $permalink_structure && ! $usingpi && ! $writable )
-		_e('You should update your .htaccess now.');
-	else
-		_e('Permalink structure updated.');
+	_e('Permalink structure updated.');
 }
 ?>
 </p></div>