<!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>[707] sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc: Handbook plugin: prevent pre-existing PHP warnings</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://meta.trac.wordpress.org/changeset/707">707</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2014-06-17 00:38:46 +0000 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handbook plugin: prevent pre-existing PHP warnings
* Explicitly declare array values before use (and check value before use in str_replace())
* Explicitly declare statically referenced methods as static
* Add instance arg to widgets()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincemailpostchangesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/email-post-changes.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookinctableofcontentsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincwidgetsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincemailpostchangesphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/email-post-changes.php (706 => 707)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/email-post-changes.php 2014-06-17 00:00:42 UTC (rev 706)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/email-post-changes.php 2014-06-17 00:38:46 UTC (rev 707)
</span><span class="lines">@@ -6,25 +6,24 @@
</span><span class="cx">
</span><span class="cx"> class WPorg_Handbook_Email_Post_Changes {
</span><span class="cx">
</span><del>- function init() {
</del><ins>+ public static function init() {
</ins><span class="cx"> add_action( 'widgets_init', array( __CLASS__, 'handbook_sidebar' ), 11 ); // After P2
</span><span class="cx"> add_filter( 'email_post_changes_emails', array( __CLASS__, 'email_post_changes_emails' ), 10, 3 );
</span><span class="cx"> add_action( 'admin_post_wporg_watchlist', array( __CLASS__, 'update_watchlist' ) );
</span><span class="cx"> add_action( 'option_email_post_changes', array( __CLASS__, 'option_email_post_changes' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function handbook_sidebar() {
-
</del><ins>+ public static function handbook_sidebar() {
</ins><span class="cx"> require_once dirname( __FILE__ ) . '/widgets.php';
</span><span class="cx"> register_widget( 'WPorg_Handbook_Widget' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function option_email_post_changes( $values ) {
</del><ins>+ public static function option_email_post_changes( $values ) {
</ins><span class="cx"> $values['post_types'] = apply_filters( 'wporg_email_changes_for_post_types', $values['post_types'] );
</span><span class="cx"> return $values;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function email_post_changes_emails( $emails, $post_before, $post_after ) {
</del><ins>+ public static function email_post_changes_emails( $emails, $post_before, $post_after ) {
</ins><span class="cx"> $post = get_post( $post_after );
</span><span class="cx"> $users = get_post_meta( $post->ID, '_wporg_watchlist', true );
</span><span class="cx"> if ( ! $users )
</span><span class="lines">@@ -37,7 +36,7 @@
</span><span class="cx"> return $emails;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function update_watchlist() {
</del><ins>+ public static function update_watchlist() {
</ins><span class="cx"> $post_id = absint( $_GET['post_id'] );
</span><span class="cx"> if ( ! $post_id || ! $post = get_post( $post_id ) ) {
</span><span class="cx"> wp_redirect( home_url( '/' ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookinctableofcontentsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php (706 => 707)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php 2014-06-17 00:00:42 UTC (rev 706)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php 2014-06-17 00:38:46 UTC (rev 707)
</span><span class="lines">@@ -72,8 +72,10 @@
</span><span class="cx"> protected function add_ids_and_jumpto_links( $tag, $content ) {
</span><span class="cx"> $items = $this->get_tags( $tag, $content );
</span><span class="cx"> $first = true;
</span><ins>+ $matches = array();
+ $replacements = array();
</ins><span class="cx">
</span><del>- foreach ($items as $item) {
</del><ins>+ foreach ( $items as $item ) {
</ins><span class="cx"> $replacement = '';
</span><span class="cx"> $matches[] = $item[0];
</span><span class="cx"> $id = sanitize_title_with_dashes($item[2]);
</span><span class="lines">@@ -88,7 +90,9 @@
</span><span class="cx"> $replacements[] = $replacement;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $content = str_replace( $matches, $replacements, $content );
</del><ins>+ if ( $replacements ) {
+ $content = str_replace( $matches, $replacements, $content );
+ }
</ins><span class="cx">
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincwidgetsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/widgets.php (706 => 707)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/widgets.php 2014-06-17 00:00:42 UTC (rev 706)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/widgets.php 2014-06-17 00:38:46 UTC (rev 707)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> parent::__construct( 'handbook', __( 'Handbook Tools', 'wporg' ), array( 'classname' => 'widget_wporg_handbook', 'description' => __( 'Shows watch/unwatch links for handbook pages.', 'wporg' ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function widget( $args ) {
</del><ins>+ function widget( $args, $instance ) {
</ins><span class="cx"> if ( ! is_user_logged_in() )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>