Changeset 4502

Timestamp:

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

Author:

johnjamesjacoby

Message:

Extract:

• Remove extract() from bbp_get_single_forum_description().
• See #2056.

File:

• trunk/includes/forums/template-tags.php (modified) (5 diffs)

trunk/includes/forums/template-tags.php

@@ -1821 +1821 @@
     function bbp_get_single_forum_description( $args = '' ) {
 
-        // Default arguments
-        $defaults = array (
+        // Parse arguments with default values
+        $r = bbp_parse_args( $args, array(
             'forum_id'  => 0,
             'before'    => '<div class="bbp-template-notice info"><p class="bbp-forum-description">',
@@ -1828 +1828 @@
             'size'      => 14,
             'feed'      => true
-        );
-        $r = bbp_parse_args( $args, $defaults, 'get_single_forum_description' );
-        extract( $r );
+        ), 'get_single_forum_description' );
 
         // Validate forum_id
-        $forum_id = bbp_get_forum_id( $forum_id );
+        $forum_id = bbp_get_forum_id( $r['forum_id'] );
 
         // Unhook the 'view all' query var adder
@@ -1854 +1852 @@
             $topic_text      = bbp_get_forum_topics_link( $forum_id );
             $time_since      = bbp_get_forum_freshness_link( $forum_id );
-            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $size ) );
+            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $r['size'] ) );
 
         // Forum has no last active data
@@ -1909 +1907 @@
 
         // Add feeds
-        //$feed_links = ( !empty( $feed ) ) ? bbp_get_forum_topics_feed_link ( $forum_id ) . bbp_get_forum_replies_feed_link( $forum_id ) : '';
+        //$feed_links = ( !empty( $r['feed'] ) ) ? bbp_get_forum_topics_feed_link ( $forum_id ) . bbp_get_forum_replies_feed_link( $forum_id ) : '';
 
         // Add the 'view all' filter back
@@ -1915 +1913 @@
 
         // Combine the elements together
-        $retstr = $before . $retstr . $after;
+        $retstr = $r['before'] . $retstr . $r['after'];
 
         // Return filtered result