# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: \includes\common
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: shortcodes.php
--- shortcodes.php Base (BASE)
+++ shortcodes.php Locally Modified (Based On LOCAL)
@@ -381,8 +381,15 @@
 	 *
 	 * @uses get_template_part()
 	 */
-	public function display_topic_form() {
+	public function display_topic_form( $attr = '', $content = ''  ) {
 
+                // Sanity check supplied info 
+                if ( !empty( $content ) || (!empty( $attr['forum_id'] ) && (!is_numeric( $attr['forum_id'] ) || !bbp_is_forum( $attr['forum_id'] ) ) ) )
+                        return $content;
+                    
+                if ( !empty( $attr['forum_id'] ) )
+                        bbp_set_form_topic_custom_value( 'forum', (int) $attr['forum_id'] );                
+                
 		// Start output buffer
 		$this->start( 'bbp_topic_form' );