<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19098] trunk/wp-admin/includes/screen.php: Always run the old contextual_help filter.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19098">19098</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-31 21:37:43 +0000 (Mon, 31 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always run the old contextual_help filter. see <a href="http://core.trac.wordpress.org/ticket/18785">#18785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19097 => 19098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-31 21:28:17 UTC (rev 19097)
+++ trunk/wp-admin/includes/screen.php 2011-10-31 21:37:43 UTC (rev 19098)
</span><span class="lines">@@ -651,22 +651,22 @@
</span><span class="cx"> // Call old contextual_help_list filter.
</span><span class="cx"> self::$_old_compat_help = apply_filters( 'contextual_help_list', self::$_old_compat_help, $this );
</span><span class="cx">
</span><del>- if ( isset( self::$_old_compat_help[ $this->id ] ) || empty($this->_help_tabs ) ) {
- // Call old contextual_help filter.
- if ( isset( self::$_old_compat_help[ $this->id ] ) )
- $contextual_help = apply_filters( 'contextual_help', self::$_old_compat_help[ $this->id ], $this->id, $this );
</del><ins>+ $old_help = isset( self::$_old_compat_help[ $this->id ] ) ? self::$_old_compat_help[ $this->id ] : '';
+ $old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this );
</ins><span class="cx">
</span><del>- if ( empty( $contextual_help ) ) {
- $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>' );
- $contextual_help = '<p>' . apply_filters( 'default_contextual_help', $default_help ) . '</p>';
- }
</del><ins>+ // 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>';
+ }
</ins><span class="cx">
</span><ins>+ if ( $old_help ) {
</ins><span class="cx"> $this->add_help_tab( array(
</span><span class="cx"> 'id' => 'contextual-help',
</span><span class="cx"> 'title' => __('Screen Info'),
</span><del>- 'content' => $contextual_help,
</del><ins>+ 'content' => $old_help,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>