Changeset 4962

Timestamp:

05/28/2013 05:52:12 PM (12 years ago)

Author:

johnjamesjacoby

Message:

When adding the reply_to link, only add onclick if threaded replies are enabled. See #2340.

File:

• trunk/includes/replies/template-tags.php (modified) (2 diffs)

trunk/includes/replies/template-tags.php

@@ -1534 +1534 @@
         ), 'get_reply_to_link' );
 
+        // Get the reply to use it's ID and post_parent
         $reply = bbp_get_reply( bbp_get_reply_id( (int) $r['id'] ) );
 
@@ -1541 +1542 @@
 
         // Build the URI and return value
-        $uri      = remove_query_arg( array( 'bbp_reply_to' ) );
-        $uri      = add_query_arg( array( 'bbp_reply_to' => $reply->ID ) );
-        $uri      = wp_nonce_url( $uri, 'respond_id_' . $reply->ID );
-        $uri      = $uri . '#new-post';
-        $onclick  = 'return addReply.moveForm("' . $r['add_below'] . '-' . $reply->ID . '","' . $reply->ID . '","' . $r['respond_id'] . '","' . $reply->post_parent . '")';
+        $uri = remove_query_arg( array( 'bbp_reply_to' ) );
+        $uri = add_query_arg( array( 'bbp_reply_to' => $reply->ID ) );
+        $uri = wp_nonce_url( $uri, 'respond_id_' . $reply->ID );
+        $uri = $uri . '#new-post';
+
+        // Only add onclick if replies are threaded
+        if ( bbp_thread_replies() ) {
+
+            // Array of classes to pass to moveForm
+            $move_form = array(
+                $r['add_below'] . '-' . $reply->ID,
+                $reply->ID,
+                $r['respond_id'],
+                $reply->post_parent
+            );
+
+            // Build the onclick
+            $onclick  = ' onclick="return addReply.moveForm(\'' . implode( "','", $move_form ) . '\');"';
+
+        // No onclick if replies are not threaded
+        } else {
+            $onclick  = '';
+        }
+
+        // Add $uri to the array, to be passed through the filter
         $r['uri'] = $uri;
-        $retval   = $r['link_before'] . '<a href="' . esc_url( $r['uri'] ) . '" class="bbp-reply-to-link" onclick=' . "'{$onclick}' >" . esc_html( $r['reply_text'] ) . '</a>' . $r['link_after'];
+        $retval   = $r['link_before'] . '<a href="' . esc_url( $r['uri'] ) . '" class="bbp-reply-to-link"' . $onclick . '>' . esc_html( $r['reply_text'] ) . '</a>' . $r['link_after'];
 
         return apply_filters( 'bbp_get_reply_to_link', $retval, $r, $args );