Changeset 4501

Timestamp:

11/24/2012 07:07:31 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Extract:

• Remove unused BBP_Forum_Walker class, and bbp_walk_forum function, that use extract().
• See #2056.

Location:

trunk/includes

Files:

• common/classes.php (modified) (1 diff)
• forums/functions.php (modified) (1 diff)

trunk/includes/common/classes.php

@@ -174 +174 @@
 
 if ( class_exists( 'Walker' ) ) :
-/**
- * Create HTML list of forums.
- *
- * @package bbPress
- * @subpackage Classes
- *
- * @since bbPress (r2514)
- *
- * @uses Walker
- */
-class BBP_Walker_Forum extends Walker {
-
-    /**
-     * @see Walker::$tree_type
-     *
-     * @since bbPress (r2514)
-     *
-     * @var string
-     */
-    var $tree_type;
-
-    /**
-     * @see Walker::$db_fields
-     *
-     * @since bbPress (r2514)
-     *
-     * @var array
-     */
-    var $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
-
-    /** Methods ***************************************************************/
-
-    /**
-     * Set the tree_type
-     *
-     * @since bbPress (r2514)
-     */
-    public function __construct() {
-        $this->tree_type = bbp_get_forum_post_type();
-    }
-
-    /**
-     * @see Walker::start_lvl()
-     *
-     * @since bbPress (r2514)
-     *
-     * @param string $output Passed by reference. Used to append additional
-     *                        content.
-     * @param int $depth Depth of page. Used for padding.
-     */
-    public function start_lvl( &$output, $depth ) {
-        $indent  = str_repeat( "\t", $depth );
-        $output .= "\n$indent<ul class='children'>\n";
-    }
-
-    /**
-     * @see Walker::end_lvl()
-     *
-     * @since bbPress (r2514)
-     *
-     * @param string $output Passed by reference. Used to append additional
-     *                        content.
-     * @param int $depth Depth of page. Used for padding.
-     */
-    public function end_lvl( &$output, $depth ) {
-        $indent  = str_repeat( "\t", $depth );
-        $output .= "$indent</ul>\n";
-    }
-
-    /**
-     * @see Walker::start_el()
-     *
-     * @since bbPress (r2514)
-     *
-     * @param string $output Passed by reference. Used to append additional
-     *                        content.
-     * @param object $forum Page data object.
-     * @param int $depth Depth of page. Used for padding.
-     * @param int $current_forum Page ID.
-     * @param array $args
-     */
-    public function start_el( &$output, $forum, $depth, $args, $current_forum ) {
-
-        $indent = $depth ? str_repeat( "\t", $depth ) : '';
-
-        extract( $args, EXTR_SKIP );
-        $css_class = array( 'bbp-forum-item', 'bbp-forum-item-' . $forum->ID );
-
-        if ( !empty( $current_forum ) ) {
-            $_current_page = bbp_get_forum( $current_forum );
-
-            if ( isset( $_current_page->ancestors ) && in_array( $forum->ID, (array) $_current_page->ancestors ) )
-                $css_class[] = 'bbp-current-forum-ancestor';
-
-            if ( $forum->ID == $current_forum )
-                $css_class[] = 'bbp_current_forum_item';
-            elseif ( $_current_page && $forum->ID == $_current_page->post_parent )
-                $css_class[] = 'bbp-current-forum-parent';
-
-        } elseif ( $forum->ID == get_option( 'page_for_posts' ) ) {
-            $css_class[] = 'bbp-current-forum-parent';
-        }
-
-        $css_class = implode( ' ', apply_filters( 'bbp_forum_css_class', $css_class, $forum ) );
-        $output .= $indent . '<li class="' . $css_class . '"><a href="' . bbp_get_forum_permalink( $forum->ID ) . '" title="' . esc_attr( wp_strip_all_tags( apply_filters( 'the_title', $forum->post_title, $forum->ID ) ) ) . '">' . $link_before . apply_filters( 'the_title', $forum->post_title, $forum->ID ) . $link_after . '</a>';
-
-        if ( !empty( $show_date ) ) {
-            $time    = ( 'modified' == $show_date ) ? $forum->post_modified : $time = $forum->post_date;
-            $output .= " " . mysql2date( $date_format, $time );
-        }
-    }
-
-    /**
-     * @see Walker::end_el()
-     *
-     * @since bbPress (r2514)
-     *
-     * @param string $output Passed by reference. Used to append additional
-     *                        content.
-     * @param object $forum Page data object. Not used.
-     * @param int $depth Depth of page. Not Used.
-     */
-    public function end_el( &$output, $forum, $depth ) {
-        $output .= "</li>\n";
-    }
-}
-
 /**
  * Create HTML dropdown list of bbPress forums/topics.

trunk/includes/forums/functions.php

@@ -664 +664 @@
 }
 
-/** Walk **********************************************************************/
-
-/**
- * Walk the forum tree
- *
- * @param object $forums Forums
- * @param int $depth Depth
- * @param int $current Current forum
- * @param array $r Parsed arguments, supported by the walker. If you want to
- *                  use your own walker, pass the 'walker' arg with the walker.
- *                  The walker defaults to {@link BBP_Walker_Forum}
- * @return object Walked forum tree
- */
-function bbp_walk_forum( $forums, $depth, $current, $r ) {
-    $walker = empty( $r['walker'] ) ? new BBP_Walker_Forum : $r['walker'];
-    $args   = array( $forums, $depth, $r, $current );
-    return call_user_func_array( array( &$walker, 'walk' ), $args );
-}
-
 /** Forum Actions *************************************************************/