Changeset 707

Timestamp:

06/17/2014 12:38:46 AM (10 years ago)

Author:

coffee2code

Message:

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()

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc

Files:

• email-post-changes.php (modified) (3 diffs)
• table-of-contents.php (modified) (2 diffs)
• widgets.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/email-post-changes.php

@@ -7 +7 @@
 class WPorg_Handbook_Email_Post_Changes {
 
-    function init() {
+    public static function init() {
         add_action( 'widgets_init', array( __CLASS__, 'handbook_sidebar' ), 11 ); // After P2
         add_filter( 'email_post_changes_emails', array( __CLASS__, 'email_post_changes_emails' ), 10, 3 );
@@ -14 +14 @@
     }
 
-    function handbook_sidebar() {
-
+    public static function handbook_sidebar() {
         require_once dirname( __FILE__ ) . '/widgets.php';
         register_widget( 'WPorg_Handbook_Widget' );
     }
 
-    function option_email_post_changes( $values ) {
+    public static function option_email_post_changes( $values ) {
         $values['post_types'] = apply_filters( 'wporg_email_changes_for_post_types', $values['post_types'] );
         return $values;
     }
 
-    function email_post_changes_emails( $emails, $post_before, $post_after ) {
+    public static function email_post_changes_emails( $emails, $post_before, $post_after ) {
         $post = get_post( $post_after );
         $users = get_post_meta( $post->ID, '_wporg_watchlist', true );
@@ -38 +37 @@
     }
 
-    function update_watchlist() {
+    public static function update_watchlist() {
         $post_id = absint( $_GET['post_id'] );
         if ( ! $post_id || ! $post = get_post( $post_id ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php

@@ -73 +73 @@
         $items = $this->get_tags( $tag, $content );
         $first = true;
+        $matches = array();
+        $replacements = array();
 
-        foreach ($items as $item) {
+        foreach ( $items as $item ) {
             $replacement = '';
             $matches[] = $item[0];
@@ -89 +91 @@
         }
 
-        $content = str_replace( $matches, $replacements, $content );
+        if ( $replacements ) {
+            $content = str_replace( $matches, $replacements, $content );
+        }
 
         return $content;

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/widgets.php

@@ -11 +11 @@
     }
 
-    function widget( $args ) {
+    function widget( $args, $instance ) {
         if ( ! is_user_logged_in() )
             return;