WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lance Willett 2014-11-01 03:40:25 +00:00
parent c07582cb64
commit 609335eef1
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-content/themes/twentyeleven/functions.php
View File

@ -390,7 +390,10 @@ endif; // twentyeleven_continue_reading_link
* @return The filtered Read More text.
*/
function twentyeleven_auto_excerpt_more( $more ) {
return ' …' . twentyeleven_continue_reading_link();
if ( ! is_admin() ) {
return ' …' . 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;

7
wp-content/themes/twentyten/functions.php
View File

@ -295,7 +295,10 @@ endif;
* @return string An ellipsis.
*/
function twentyten_auto_excerpt_more( $more ) {
return ' …' . twentyten_continue_reading_link();
if ( ! is_admin() ) {
return ' …' . 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;

2
wp-includes/version.php
View File

@ -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.