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

Timestamp:

06/17/2014 12:00:42 AM (10 years ago)

Author:

coffee2code

Message:

Handbook plugin: misc fixes and tweaks. Fixes #250

• Fix to set object post_type variable when post_type is 'handbook'
• Fix to use get_post_type() instead of referencing no-long-existing object variable
• Don't append suffix for 'page' post_type (for ToC and widgets)
• Honor before_widget and after_widget config for widget
• More succinct and thorough array typecasting
• Internationalize strings
• Minor spacing and code formatting tweaks

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php (modified) (5 diffs)

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

@@ -11 +11 @@
 
     function __construct( $post_types ) {
-        $this->post_types = $post_types;
+        $this->post_types = (array) $post_types;
         add_action( 'template_redirect', array( $this, 'load_filters' ) );
     }
@@ -23 +23 @@
 
     function append_suffix( $t ) {
-        if ( 'handbook' == $t )
+        if ( in_array( $t, array( 'handbook', 'page' ) ) ) {
             return $t;
+        }
 
         return $t . '-handbook';
@@ -42 +43 @@
             $pages_header = 'h3';
 
-        if ( $pages = wp_list_pages( array( 'child_of' => get_the_ID(), 'echo' => false, 'title_li' => false, 'post_type' => $this->post_type ) ) )
+        if ( $pages = wp_list_pages( array( 'child_of' => get_the_ID(), 'echo' => false, 'title_li' => false, 'post_type' => get_post_type() ) ) )
             $toc .= "<$pages_header>Pages</$pages_header><ul class=\"items\">$pages</ul>";
 
@@ -48 +49 @@
             $toc .= $this->styles;
             $toc .= '<div class="table-of-contents">';
-            $toc .= "<$contents_header>Contents</$contents_header><ul class=\"items\">";
+            $toc .= "<$contents_header>" . __( 'Topics', 'wporg' ) . "</$contents_header><ul class=\"items\">";
             $last_item = false;
             foreach ( $items as $item ) {
@@ -79 +80 @@
 
             if ( ! $first ) {
-                $replacement .= '<p class="toc-jump"><a href="#top">Top &uarr;</a></p>';
+                $replacement .= '<p class="toc-jump"><a href="#top">' . __( 'Top &uarr;', 'wporg' ) . '</a></p>';
             } else {
                 $first = false;