From 609335eef1a6af828002c03b10fa92712aeda297 Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Sat, 1 Nov 2014 03:40:25 +0000
Subject: [PATCH] Twenty Ten and Eleven: don't display modified excerpt link in
 wp-admin.

Props kraftbj, fixes #30026.

Built from https://develop.svn.wordpress.org/trunk@30145


git-svn-id: http://core.svn.wordpress.org/trunk@30145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/functions.php | 7 +++++--
 wp-content/themes/twentyten/functions.php    | 7 +++++--
 wp-includes/version.php                      | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index b713933ca7..41cd96865d 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -390,7 +390,10 @@ endif; // twentyeleven_continue_reading_link
  * @return The filtered Read More text.
  */
 function twentyeleven_auto_excerpt_more( $more ) {
-	return ' &hellip;' . twentyeleven_continue_reading_link();
+	if ( ! is_admin() ) {
+		return ' &hellip;' . twentyeleven_continue_reading_link();
+	}
+	return $more;
 }
 add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
 
@@ -406,7 +409,7 @@ add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
  * @return string The filtered "Continue Reading" link.
  */
 function twentyeleven_custom_excerpt_more( $output ) {
-	if ( has_excerpt() && ! is_attachment() ) {
+	if ( has_excerpt() && ! is_attachment() && ! is_admin() ) {
 		$output .= twentyeleven_continue_reading_link();
 	}
 	return $output;
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 341f57b894..75b6ba46d4 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -295,7 +295,10 @@ endif;
  * @return string An ellipsis.
  */
 function twentyten_auto_excerpt_more( $more ) {
-	return ' &hellip;' . twentyten_continue_reading_link();
+	if ( ! is_admin() ) {
+		return ' &hellip;' . twentyten_continue_reading_link();
+	}
+	return $more;
 }
 add_filter( 'excerpt_more', 'twentyten_auto_excerpt_more' );
 
@@ -311,7 +314,7 @@ add_filter( 'excerpt_more', 'twentyten_auto_excerpt_more' );
  * @return string Excerpt with a pretty "Continue Reading" link.
  */
 function twentyten_custom_excerpt_more( $output ) {
-	if ( has_excerpt() && ! is_attachment() ) {
+	if ( has_excerpt() && ! is_attachment() && ! is_admin() ) {
 		$output .= twentyten_continue_reading_link();
 	}
 	return $output;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6be5872667..f723357cb0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30144';
+$wp_version = '4.1-alpha-30145';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.