From 3de47877d6f68d01a0013a6653055751a8da73d4 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sun, 6 Nov 2011 18:13:06 +0000
Subject: [PATCH] Remove default help text. Keep the default_help filter in
 place for plugins. fixes #19154.

git-svn-id: https://develop.svn.wordpress.org/trunk@19185 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/screen.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
index 3a0bf88cec..bc16699d1b 100644
--- a/wp-admin/includes/screen.php
+++ b/wp-admin/includes/screen.php
@@ -682,10 +682,9 @@ final class WP_Screen {
 
 		// Default help only if there is no old-style block of text and no new-style help tabs.
 		if ( empty( $old_help ) && empty( $this->_help_tabs ) ) {
-			$default_help = __( '<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>' );
-			$default_help .= '<br />';
-			$default_help .= __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' );
-			$old_help = '<p>' . apply_filters( 'default_contextual_help', $default_help ) . '</p>';
+			$default_help = apply_filters( 'default_contextual_help', '' );
+			if ( $default_help )
+				$old_help = '<p>' . $default_help . '</p>';
 		}
 
 		if ( $old_help ) {
@@ -749,15 +748,21 @@ final class WP_Screen {
 			$this->render_screen_options();
 		?>
 		</div>
+		<?php
+		if ( ! $this->_help_tabs && ! $this->show_screen_options() )
+			return;
+		?>
 		<div id="screen-meta-links">
-		<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-		<a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a>
-		</div>
-		<?php if ( $this->show_screen_options() ) { ?>
-		<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-		<a href="#screen-options-wrap" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
-		</div>
-		<?php } ?>
+		<?php if ( $this->_help_tabs ) : ?>
+			<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
+			<a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings"><?php _e( 'Help' ); ?></a>
+			</div>
+		<?php endif;
+		if ( $this->show_screen_options() ) : ?>
+			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
+			<a href="#screen-options-wrap" id="show-settings-link" class="show-settings"><?php _e( 'Screen Options' ); ?></a>
+			</div>
+		<?php endif; ?>
 		</div>
 		<?php
 	}