Changeset 4487

Timestamp:

11/23/2012 11:20:42 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Extract:

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

File:

• trunk/includes/core/update.php (modified) (4 diffs)

trunk/includes/core/update.php

@@ -159 +159 @@
 function bbp_create_initial_content( $args = array() ) {
 
-    $defaults = array(
+    $r = bbp_parse_args( $args, array(
         'forum_parent'  => 0,
         'forum_status'  => 'publish',
@@ -168 +168 @@
         'reply_title'   => __( 'Re: Hello World!',                         'bbpress' ),
         'reply_content' => __( 'Oh, and this is what a reply looks like.', 'bbpress' ),
-    );
-    $r = bbp_parse_args( $args, $defaults, 'create_initial_content' );
-    extract( $r );
+    ), 'create_initial_content' );
 
     // Create the initial forum
     $forum_id = bbp_insert_forum( array(
-        'post_parent'  => $forum_parent,
-        'post_status'  => $forum_status,
-        'post_title'   => $forum_title,
-        'post_content' => $forum_content
+        'post_parent'  => $r['forum_parent'],
+        'post_status'  => $r['forum_status'],
+        'post_title'   => $r['forum_title'],
+        'post_content' => $r['forum_content']
     ) );
 
@@ -183 +181 @@
     $topic_id = bbp_insert_topic(
         array(
-            'post_parent'  => $forum_id,
-            'post_title'   => $topic_title,
-            'post_content' => $topic_content
+            'post_parent'  => forum_id,
+            'post_title'   => $r['topic_title'],
+            'post_content' => $r['topic_content']
         ),
         array( 'forum_id'  => $forum_id )
@@ -194 +192 @@
         array(
             'post_parent'  => $topic_id,
-            'post_title'   => $reply_title,
-            'post_content' => $reply_content
+            'post_title'   => $r['reply_title'],
+            'post_content' => $r['reply_content']
         ),
         array(