From ca60ed1d07571673eaddf9ff808efa59ceebab79 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 1 Dec 2010 17:16:22 +0000
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20nag=20to=20Change=20Permalinks?=
 =?UTF-8?q?=20if=20permalink=20structure=20is=20defined.=20Props=20demetri?=
 =?UTF-8?q?s.=20fixes=20#13918?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://develop.svn.wordpress.org/trunk@16651 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 19b7d636e7..db947d401a 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1117,7 +1117,7 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 
 	if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
 		$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
-		if ( current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
+		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
 			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
 		if ( isset($view_post) )
 			$return .= "<span id='view-post-btn'><a href='$permalink' class='button' target='_blank'>$view_post</a></span>\n";