Changeset 5177

Timestamp:

11/23/2013 01:19:54 PM (12 years ago)

Author:

johnjamesjacoby

Message:

When creating new replies, do not force them to have a title. This is new as of WordPress 3.7, to be more accommodating to post formats that don't cater to titles very well (image/status/video/etc...)

Until now, replies to topics have always shared the topic title (and incremental slugs) in common with each other. With this change, replies will now mostly be identified via their post ID. This helps with search results, and avoids some reply-slug confusion as to why they need to have titles or slugs at all.

Props alex-ye for the clever solution. Fixes #2291.

Location:

trunk/includes

Files:

• common/template.php (modified) (2 diffs)
• core/filters.php (modified) (1 diff)
• replies/functions.php (modified) (1 diff)
• replies/template.php (modified) (2 diffs)

trunk/includes/common/template.php

@@ -1580 +1580 @@
     if ( bbp_is_reply_edit() ) : ?>
 
-        <input type="hidden" name="bbp_reply_title" id="bbp_reply_title" value="<?php bbp_reply_title(); ?>" />
         <input type="hidden" name="bbp_reply_id"    id="bbp_reply_id"    value="<?php bbp_reply_id(); ?>" />
         <input type="hidden" name="bbp_reply_to"    id="bbp_reply_to"    value="<?php bbp_form_reply_to(); ?>" />
@@ -1592 +1591 @@
     else : ?>
 
-        <input type="hidden" name="bbp_reply_title" id="bbp_reply_title" value="<?php printf( __( 'Reply To: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" />
         <input type="hidden" name="bbp_topic_id"    id="bbp_topic_id"    value="<?php bbp_topic_id(); ?>" />
         <input type="hidden" name="bbp_reply_to"    id="bbp_reply_to"    value="<?php bbp_form_reply_to(); ?>" />

trunk/includes/core/filters.php

@@ -94 +94 @@
 add_filter( 'bbp_edit_reply_pre_title', 'wp_filter_kses'  );
 add_filter( 'bbp_edit_topic_pre_title', 'wp_filter_kses'  );
+
+// Reply title fallback
+add_filter( 'the_title', 'bbp_get_reply_title_fallback', 1, 2 );
 
 // Prevent posting malicious or malformed content on new/edit topic/reply

trunk/includes/replies/functions.php

@@ -275 +275 @@
     // Filter and sanitize
     $reply_title = apply_filters( 'bbp_new_reply_pre_title', $reply_title );
-
-    // No reply title
-    if ( empty( $reply_title ) )
-        bbp_add_error( 'bbp_reply_title', __( '<strong>ERROR</strong>: Your reply needs a title.', 'bbpress' ) );
 
     /** Reply Content *********************************************************/

trunk/includes/replies/template.php

@@ -547 +547 @@
     }
 
+    /**
+     * Get empty reply title fallback.
+     *
+     * @since bbPress (r5177)
+     *
+     * @param string $reply_title Required. Reply Title
+     * @param int $reply_id Required. Reply ID
+     * @uses bbp_get_reply_topic_title() To get the reply topic title
+     * @uses apply_filters() Calls 'bbp_get_reply_title_fallback' with the title and reply ID
+     * @return string Title of reply
+     */
+    function bbp_get_reply_title_fallback( $post_title = '', $post_id = 0 ) {
+
+        // Bail if title not empty, or post is not a reply
+        if ( ! empty( $post_title ) || ! bbp_is_reply( $post_id ) ) {
+            return $post_title;
+        }
+
+        // Get reply topic title.
+        $topic_title = bbp_get_reply_topic_title( $post_id );
+
+        // Get empty reply title fallback.
+        $reply_title = sprintf( __( 'Reply To: %s', 'bbpress' ), $topic_title );
+
+        return apply_filters( 'bbp_get_reply_title_fallback', $reply_title, $post_id, $topic_title );
+    }
+
 /**
  * Output the content of the reply
@@ -1580 +1607 @@
      * @uses apply_filters() Calls 'bbp_get_reply_to_link' with the formatted link,
      *                        the arguments array, and the reply
-     * @return string Link for a reply to a reply 
+     * @return string Link for a reply to a reply
      */
     function bbp_get_reply_to_link( $args = array() ) {