From ae3fc0525391f77223464b4d22efb5f8b615a009 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 14 Nov 2008 23:54:15 +0000
Subject: [PATCH] contextual_help_link filter. Pass page hook instead of
 pagenow to screen_meta(). fixes #8216

git-svn-id: http://svn.automattic.com/wordpress/trunk@9702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php      | 2 +-
 wp-admin/includes/template.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 4c180d279..b948f14ca 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -91,7 +91,7 @@ if ( function_exists('mb_strlen') ) {
 <?php
 do_action('admin_notices');
 
-screen_meta($pagenow, $hook_suffix);
+screen_meta($hook_suffix);
 unset($hook_suffix);
 
 if ( $parent_file == 'options-general.php' ) {
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 8131caedc..0ad3f4fd7 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3177,7 +3177,7 @@ function _post_states($post) {
 	}
 }
 
-function screen_meta($screen, $suffix = '') {
+function screen_meta($screen) {
 	global $wp_meta_boxes;
 
 	$screen = str_replace('.php', '', $screen);
@@ -3220,7 +3220,8 @@ function screen_meta($screen, $suffix = '') {
 	global $title;
 
 	$help['post'] =  __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>');
-	$help['general-settings'] =  __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
+	$help['options-general'] =  __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
+	$help = apply_filters('contextual_help_link', $help, $screen); 
 	?>
 	<div id="contextual-help-wrap" class="hidden">
 	<?php
@@ -3242,7 +3243,7 @@ function screen_meta($screen, $suffix = '') {
 	$contextual_help .= '<br />';
 	$contextual_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>');
 	$contextual_help .= "</div>\n";
-	echo apply_filters('contextual_help', $contextual_help, $screen, $suffix);
+	echo apply_filters('contextual_help', $contextual_help, $screen);
 	?>
 	</div>