Changes in sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/watchlist.php [10794:10187]

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/watchlist.php (modified) (7 diffs)

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

@@ -1 +1 @@
 <?php
-/**
- * Class providing P2/O2 watchlist functionality.
- *
- * @package handbook
- */
 
 class WPorg_Handbook_Watchlist {
 
-    /**
-     * Memoized array of handbook post types.
-     *
-     * @var array
-     */
-    private static $post_types;
+    private static $post_types = array( 'handbook' );
 
-    /**
-     * Initializes actions.
-     */
     public static function init() {
-        add_action( 'init', [ __CLASS__, 'on_init' ] );
+        add_action( 'init', array( __CLASS__, 'on_init' ) );
+    }
+
+    public static function on_init() {
+        self::$post_types = (array) apply_filters( 'handbook_post_types', self::$post_types );
+        self::$post_types = array_map( array( __CLASS__, 'append_suffix' ), self::$post_types );
+
+        add_action( 'p2_action_links', array(__CLASS__, 'display_action_link'), 100 );
+        add_filter( 'o2_filter_post_actions', array( __CLASS__, 'add_o2_action_link' ) );
+        add_filter( 'o2_filter_post_action_html', array( __CLASS__, 'get_o2_action_link' ), 10, 2 );
     }
 
     /**
-     * Performs actions intended to occur during 'init' action.
+     * Appends '-handbook' to the dynamic post type, if not already 'handbook'.
+     *
+     * @param  string $t Hanbook post type name.
+     * @return string
      */
-    public static function on_init() {
-        self::$post_types = WPorg_Handbook_Init::get_post_types();
+    private static function append_suffix( $t ) {
+        if ( in_array( $t, array( 'handbook', 'page' ) ) ) {
+            return $t;
+        }
 
-        self::o2_register_default_post_action_states();
-
-        add_action( 'p2_action_links',            [ __CLASS__, 'display_action_link' ], 100 );
-        add_filter( 'o2_filter_post_actions',     [ __CLASS__, 'add_o2_action_link' ] );
-        add_filter( 'o2_filter_post_action_html', [ __CLASS__, 'get_o2_action_link' ], 10, 2 );
+        return $t . '-handbook';
     }
 
     /**
-     * Returns default post action info.
-     *
-     * @param string $type The post action type. Either 'watch' or 'unwatch'.
-     * @return array
-     */
-    protected static function get_default_post_action_info( $type ) {
-        $info = [];
-
-        if ( ! in_array( $type, [ 'unwatch', 'watch' ] ) ) {
-            return $info;
-        }
-
-        if ( 'watch' === $type ) {
-            $info = [
-                'shortText' => __( 'Watch', 'wporg' ),
-                'title'     => __( 'Get notified about changes to this page', 'wporg' ),
-                'genericon' => 'genericon-subscribe',
-                'classes'   => [ 'genericon', 'genericon-subscribe' ],
-                'rel'       => false,
-            ];
-        } else {
-            $info = [
-                'shortText' => __( 'Unwatch', 'wporg' ),
-                'title'     => __( 'Stop getting notified about changes to this page', 'wporg' ),
-                'genericon' => 'genericon-unsubscribe',
-                'classes'   => [ 'genericon', 'genericon-unsubscribe' ],
-                'rel'       => false,
-            ];
-        }
-
-        return $info;
-    }
-
-    /**
-     * Registers default post action states.
-     */
-    public static function o2_register_default_post_action_states() {
-        if( ! function_exists( 'o2_register_post_action_states' ) ) {
-            return;
-        }
-
-        o2_register_post_action_states( 'watch', [
-            'unwatch' => self::get_default_post_action_info( 'unwatch' ),
-            'watch'   => self::get_default_post_action_info( 'watch' ),
-        ] );
-    }
-
-    /**
-     * Adds a 'Watch' action link to O2.
-     *
-     * @param array $actions Array of O2 actions.
-     * @return array
+     * Adds a 'Watch' action link to O2
      */
     public static function add_o2_action_link( $actions ) {
@@ -99 +45 @@
         }
 
-        if ( in_array( $post->post_type, self::$post_types ) && ! is_post_type_archive( self::$post_types ) ) {
+        if ( 'page' == $post->post_type || ( in_array( $post->post_type, self::$post_types ) && ! is_post_type_archive( self::$post_types ) ) ) {
             $watchlist = get_post_meta( $post->ID, '_wporg_watchlist', true );
 
             if ( $watchlist && in_array( get_current_user_id(), $watchlist ) ) {
-                $actions[35] = wp_parse_args( [
+                $actions[35] = [
                     'action'  => 'watch',
+                    'text'    => __( 'Unwatch', 'wporg' ),
                     'href'    => wp_nonce_url( admin_url( 'admin-post.php?action=wporg_watchlist&post_id=' . $post->ID ), 'unwatch-' . $post->ID ),
-                    'initialState' => 'unwatch',
-                ], self::get_default_post_action_info( 'unwatch' ) );
+                    'title'   => __( 'Stop getting notified about changes to this page', 'wporg' ),
+                    'classes' => [ 'genericon', 'genericon-unsubscribe' ],  
+                ];
             } else {
-                $actions[35] = wp_parse_args( [
+                $actions[35] = [
                     'action'  => 'watch',
+                    'text'    => __( 'Watch', 'wporg' ),
                     'href'    => wp_nonce_url( admin_url( 'admin-post.php?action=wporg_watchlist&watch=1&post_id=' . $post->ID ), 'watch-' . $post->ID ),
-                    'initialState' => 'watch',
-                ], self::get_default_post_action_info( 'watch' ) );
+                    'title'   => __( 'Get notified about changes to this page', 'wporg' ),
+                    'classes' => [ 'genericon', 'genericon-subscribe' ],
+                ];
             }
         }
-
         return $actions;
     }
 
     /**
-     * Returns the HTML for the watch o2 post action.
-     *
-     * @param string $html   The HTML for the given action.
-     * @param array  $action Data about the action.
-     * @return string
+     * Create the HTML for the watch o2 post action.
      */
     public static function get_o2_action_link( $html, $action ) {
@@ -134 +79 @@
                 $action['title'],
                 implode( ' ', $action['classes'] ),
-                $action['shortText']
+                $action['text']
             );
         }
@@ -142 +87 @@
 
     /**
-     * Outputs a 'Watch' action link to P2.
+     * Adds a 'Watch' action link to P2
      */
     public static function display_action_link() {
+
         if ( ! is_user_logged_in() ) {
             return;
@@ -150 +96 @@
 
         $post = get_post();
-        if ( ! $post ) {
-            return;
-        }
 
-        if ( in_array( $post->post_type, self::$post_types ) && ! is_post_type_archive( self::$post_types ) ) {
+        if ( 'page' == $post->post_type || ( in_array( $post->post_type, self::$post_types ) && ! is_post_type_archive( self::$post_types ) ) ) {
+
             $watchlist = get_post_meta( $post->ID, '_wporg_watchlist', true );
 
@@ -172 +116 @@
                 );
             }
+
         }
+
     }
 
@@ -178 +124 @@
 
 WPorg_Handbook_Watchlist::init();
+