Changeset 4484

Timestamp:

11/23/2012 11:08:58 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Extract:

• Remove extract() from bbp_get_the_content().
• Other general code cleanup.
• See #2056.

File:

• trunk/includes/common/template-tags.php (modified) (4 diffs)

trunk/includes/common/template-tags.php

@@ -1579 +1579 @@
     function bbp_get_the_content( $args = array() ) {
 
-        // Default arguments
-        $defaults = array(
+        // Parse arguments with default values
+        $r = bbp_parse_args( $args, array(
             'context'       => 'topic',
             'before'        => '<div class="bbp-the-content-wrapper">',
@@ -1592 +1592 @@
             'teeny'         => true,
             'quicktags'     => true
-        );
-        $r = bbp_parse_args( $args, $defaults, 'get_the_content' );
-        extract( $r );
+        ), 'get_the_content' );
 
         // Assume we are not editing
@@ -1603 +1601 @@
 
         // Output something before the editor
-        if ( !empty( $before ) )
-            echo $before;
+        if ( !empty( $r['before'] ) ) {
+            echo $r['before'];
+        }
 
         // Get sanitized content
-        if ( bbp_is_edit() )
-            $post_content = call_user_func( 'bbp_get_form_' . $context . '_content' );
+        if ( bbp_is_edit() ) {
+            $post_content = call_user_func( 'bbp_get_form_' . $r['context'] . '_content' );
+        }
 
         // Use TinyMCE if available
         if ( bbp_use_wp_editor() ) :
-            wp_editor( htmlspecialchars_decode( $post_content, ENT_QUOTES ), 'bbp_' . $context . '_content', array(
-                'wpautop'       => $wpautop,
-                'media_buttons' => $media_buttons,
-                'textarea_rows' => $textarea_rows,
-                'tabindex'      => $tabindex,
-                'editor_class'  => $editor_class,
-                'tinymce'       => $tinymce,
-                'teeny'         => $teeny,
-                'quicktags'     => $quicktags
+            wp_editor( htmlspecialchars_decode( $post_content, ENT_QUOTES ), 'bbp_' . $r['context'] . '_content', array(
+                'wpautop'       => $r['wpautop'],
+                'media_buttons' => $r['media_buttons'],
+                'textarea_rows' => $r['textarea_rows'],
+                'tabindex'      => $r['tabindex'],
+                'editor_class'  => $r['editor_class'],
+                'tinymce'       => $r['tinymce'],
+                'teeny'         => $r['teeny'],
+                'quicktags'     => $r['quicktags']
             ) );
 
@@ -1631 +1631 @@
         else : ?>
 
-            <textarea id="bbp_<?php echo esc_attr( $context ); ?>_content" class="<?php echo esc_attr( $editor_class ); ?>" name="bbp_<?php echo esc_attr( $context ); ?>_content" cols="60" rows="<?php echo esc_attr( $textarea_rows ); ?>" tabindex="<?php echo esc_attr( $tabindex ); ?>"><?php echo $post_content; ?></textarea>
+            <textarea id="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" class="<?php echo esc_attr( $r['editor_class'] ); ?>" name="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" cols="60" rows="<?php echo esc_attr( $r['textarea_rows'] ); ?>" tabindex="<?php echo esc_attr( $r['tabindex'] ); ?>"><?php echo $r['post_content']; ?></textarea>
 
         <?php endif;
 
         // Output something after the editor
-        if ( !empty( $after ) )
-            echo $after;
+        if ( !empty( $r['after'] ) ) {
+            echo $r['after'];
+        }
 
         // Put the output into a usable variable