Remove default help text. Keep the default_help filter in place for plugins. fixes #19154.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f2df6bb98a
commit
ab5f3aa79c
|
@ -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.
|
// 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 ) ) {
|
if ( empty( $old_help ) && empty( $this->_help_tabs ) ) {
|
||||||
$default_help = __( '<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>' );
|
$default_help = apply_filters( 'default_contextual_help', '' );
|
||||||
$default_help .= '<br />';
|
if ( $default_help )
|
||||||
$default_help .= __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' );
|
$old_help = '<p>' . $default_help . '</p>';
|
||||||
$old_help = '<p>' . apply_filters( 'default_contextual_help', $default_help ) . '</p>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $old_help ) {
|
if ( $old_help ) {
|
||||||
|
@ -749,15 +748,21 @@ final class WP_Screen {
|
||||||
$this->render_screen_options();
|
$this->render_screen_options();
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
<?php
|
||||||
|
if ( ! $this->_help_tabs && ! $this->show_screen_options() )
|
||||||
|
return;
|
||||||
|
?>
|
||||||
<div id="screen-meta-links">
|
<div id="screen-meta-links">
|
||||||
<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
|
<?php if ( $this->_help_tabs ) : ?>
|
||||||
<a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a>
|
<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
|
||||||
</div>
|
<a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings"><?php _e( 'Help' ); ?></a>
|
||||||
<?php if ( $this->show_screen_options() ) { ?>
|
</div>
|
||||||
<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
|
<?php endif;
|
||||||
<a href="#screen-options-wrap" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
|
if ( $this->show_screen_options() ) : ?>
|
||||||
</div>
|
<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
|
||||||
<?php } ?>
|
<a href="#screen-options-wrap" id="show-settings-link" class="show-settings"><?php _e( 'Screen Options' ); ?></a>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue