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

Revert other stuffs from [19374]. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-11-21 15:43:57 +00:00
parent af5605d3f9
commit 75c741cd8b
6 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/about.php
View File

@ -10,7 +10,6 @@
require_once( './admin.php' );
$title = __( 'About' );
$parent_file = 'about.php';
list( $display_version ) = explode( '-', $wp_version );

5
wp-admin/admin-header.php
View File

@ -114,11 +114,10 @@ if ( is_network_admin() )
do_action('network_admin_notices');
elseif ( is_user_admin() )
do_action('user_admin_notices');
elseif ( 'about' != $current_screen->parent_base )
else
do_action('admin_notices');
if ( 'about' != $current_screen->parent_base )
do_action('all_admin_notices');
do_action('all_admin_notices');
if ( $parent_file == 'options-general.php' )
require(ABSPATH . 'wp-admin/options-head.php');

1
wp-admin/credits.php
View File

@ -10,7 +10,6 @@
require_once( './admin.php' );
$title = __( 'Credits' );
$parent_file = 'about.php';
add_contextual_help($current_screen,
'<p>' . __('Each name or handle is a link to that person&#8217;s profile in the WordPress.org community directory.') . '</p>' .

1
wp-admin/freedoms.php
View File

@ -10,7 +10,6 @@
require_once( './admin.php' );
$title = __( 'Freedoms' );
$parent_file = 'about.php';
list( $display_version ) = explode( '-', $wp_version );

3
wp-content/themes/twentyeleven/image.php
View File

@ -34,9 +34,8 @@ get_header(); ?>
$metadata['width'],
$metadata['height'],
esc_url( get_permalink( $post->post_parent ) ),
$blah = get_the_title( $post->post_parent )
get_the_title( $post->post_parent )
);
var_dump( $blah );
?>
<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-meta -->

4
wp-includes/plugin.php
View File

@ -283,9 +283,9 @@ function remove_all_filters($tag, $priority = false) {
if( isset($wp_filter[$tag]) ) {
if( false !== $priority && isset($wp_filter[$tag][$priority]) )
$wp_filter[$tag][$priority] = array();
unset($wp_filter[$tag][$priority]);
else
$wp_filter[$tag] = array();
unset($wp_filter[$tag]);
}
if( isset($merged_filters[$tag]) )