From 75c741cd8be8d21df8bc386e9dbf387de0fa0314 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 21 Nov 2011 15:43:57 +0000
Subject: [PATCH] Revert other stuffs from [19374].

git-svn-id: http://svn.automattic.com/wordpress/trunk@19376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php                       | 1 -
 wp-admin/admin-header.php                | 5 ++---
 wp-admin/credits.php                     | 1 -
 wp-admin/freedoms.php                    | 1 -
 wp-content/themes/twentyeleven/image.php | 3 +--
 wp-includes/plugin.php                   | 4 ++--
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 6f0323455..51940f7b0 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -10,7 +10,6 @@
 require_once( './admin.php' );
 
 $title = __( 'About' );
-$parent_file = 'about.php';
 
 list( $display_version ) = explode( '-', $wp_version );
 
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index e04e0c804..f2fa9f581 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -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');
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index 42ce1ded2..a2af340ab 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -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>' .
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 6731df44c..93421fcd6 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -10,7 +10,6 @@
 require_once( './admin.php' );
 
 $title = __( 'Freedoms' );
-$parent_file = 'about.php';
 
 list( $display_version ) = explode( '-', $wp_version );
 
diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php
index 40efb92b5..c6c8544b1 100644
--- a/wp-content/themes/twentyeleven/image.php
+++ b/wp-content/themes/twentyeleven/image.php
@@ -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 -->
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index e34133ff7..bb71d3d3b 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -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]) )