Changeset 954

Timestamp:

10/29/2014 08:07:38 PM (12 years ago)

Author:

coffee2code

Message:

Code Reference: override default handbook configuration (and other affected areas) to make the canonical post type slug plural

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc

Files:

• handbooks.php (modified) (2 diffs)
• redirects.php (modified) (2 diffs)
• template-tags.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php

@@ -38 +38 @@
 
                 add_filter( 'the_content', array( __CLASS__, 'autolink_credits' ) );
+
+                add_filter( 'handbook_post_type_defaults', array( __CLASS__, 'filter_handbook_post_type_defaults' ), 10, 2 );
 
                 // Add the handbook's 'Watch' action link.
@@ -116 +118 @@
 
         /**
+         * Overrides default handbook post type configuration.
+         *
+         * Specifically, uses a plural slug while retaining pre-existing singular post
+         * type name.
+         *
+         * @access public
+         *
+         * @param  array  $defaults  The default post type configuration.
+         * @param  string $post_type The post type name.
+         * @return array
+         */
+        public static function filter_handbook_post_type_defaults( $defaults, $post_type ) {
+                $defaults['rewrite'] = array(
+                        'feeds'      => false,
+                        'slug'       => $post_type . 's',
+                        'with_front' => false,
+                );
+
+                return $defaults;
+        }
+
+        /**
          * For specific credit pages, link @usernames references to their profiles on
          * profiles.wordpress.org.

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/redirects.php

@@ -25 +25 @@
                 add_action( 'template_redirect', array( __CLASS__, 'redirect_handbook' ) );
                 add_action( 'template_redirect', array( __CLASS__, 'redirect_resources' ) );
-                add_action( 'template_redirect', array( __CLASS__, 'redirect_pluralized_handbooks' ), 1 );
+                add_action( 'template_redirect', array( __CLASS__, 'redirect_singularized_handbooks' ), 1 );
                 add_action( 'template_redirect', array( __CLASS__, 'redirect_pluralized_reference_post_types' ), 1 );
         }
@@ -67 +67 @@
 
         /**
-         * Redirects requests for the pluralized slugs of the handbooks.
-         *
-         * Note: this is a convenience redirect of just the naked slugs and not a
-         * fix for any deployed links.
+         * Redirects requests for the singularized form of handbook slugs to the
+         * pluralized version.
          */
-        public static function redirect_pluralized_handbooks() {
-                $name = get_query_var( 'name' );
+        public static function redirect_singularized_handbooks() {
+                $path = trailingslashit( $_SERVER['REQUEST_URI'] );
 
-                // '/plugins' => '/plugin'
-                if ( 'plugins' == $name ) {
-                        wp_redirect( get_post_type_archive_link( 'plugin-handbook' ), 301 );
+                // '/plugin' => '/plugins'
+                if ( 0 === strpos( $path, '/plugin/' ) ) {
+                        $path = get_post_type_archive_link( 'plugin-handbook' ) . substr( $path, 8 );
+                        wp_redirect( $path, 301 );
                         exit();
                 }
 
-                // '/themes' => '/theme'
-                if ( 'themes' == $name ) {
-                        wp_redirect( get_post_type_archive_link( 'theme-handbook' ), 301 );
+                // '/theme' => '/themes'
+                if ( 0 === strpos( $path, '/theme/' ) ) {
+                        $path = get_post_type_archive_link( 'theme-handbook' ) . substr( $path, 7 );
+                        wp_redirect( $path, 301 );
                         exit();
                 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php

@@ -438 +438 @@
                         case 'reference':
                                 return __( 'Code Reference', 'wporg' );
-                        case 'plugin':
+                        case 'plugins':
                                 return __( 'Plugin Handbook', 'wporg' );
-                        case 'theme':
+                        case 'themes':
                                 return __( 'Theme Handbook', 'wporg' );
                         default: