Changeset 6354

Timestamp:

03/03/2017 03:58:52 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Hidden: Revert part of r6303, and improve some surrounding code:

• Tiny function-call optimizations
• Use integers for _n() and formatted strings for output
• Type casting, phpdoc, and code formatting improvements

Fixes #3077.

Location:

trunk/src/includes

Files:

• forums/template.php (modified) (2 diffs)
• topics/template.php (modified) (2 diffs)

trunk/src/includes/forums/template.php

@@ -1269 +1269 @@
      * @param int $forum_id Optional. Topic id
      * @uses bbp_get_forum_id() To get the forum id
-     * @uses bbp_get_forum() To get the forum
+     * @uses bbp_get_forum_permalink() To get the forum permalink
      * @uses bbp_get_forum_topic_count() To get the forum topic count
-     * @uses bbp_get_forum_permalink() To get the forum permalink
      * @uses bbp_get_forum_topic_count_hidden() To get the forum hidden
      *                                           topic count
@@ -1280 +1279 @@
      */
     function bbp_get_forum_topics_link( $forum_id = 0 ) {
-        $forum    = bbp_get_forum( $forum_id );
-        $forum_id = $forum->ID;
-        $topics   = sprintf( _n( '%s topic', '%s topics', bbp_get_forum_topic_count( $forum_id, true, false ), 'bbpress' ), bbp_get_forum_topic_count( $forum_id ) );
-        $retval   = '';
+        $forum_id = bbp_get_forum_id( $forum_id );
+        $link     = bbp_get_forum_permalink( $forum_id );
+        $topics   = sprintf( _n( '%s topic', '%s topics', bbp_get_forum_topic_count( $forum_id, true, true ), 'bbpress' ), bbp_get_forum_topic_count( $forum_id, true, false ) );
 
         // First link never has view=all
-        if ( bbp_get_view_all( 'edit_others_topics' ) ) {
-            $retval .= "<a href='" . esc_url( bbp_remove_view_all( bbp_get_forum_permalink( $forum_id ) ) ) . "'>" . esc_html( $topics ) . "</a>";
-        } else {
-            $retval .= esc_html( $topics );
-        }
+        $retval = bbp_get_view_all( 'edit_others_topics' )
+            ? "<a href='" . esc_url( bbp_remove_view_all( $link ) ) . "'>" . esc_html( $topics ) . "</a>"
+            : esc_html( $topics );
 
         // Get deleted topics
-        $deleted = bbp_get_forum_topic_count_hidden( $forum_id );
+        $deleted_int = bbp_get_forum_topic_count_hidden( $forum_id, true  );
 
         // This forum has hidden topics
-        if ( ! empty( $deleted ) && current_user_can( 'edit_others_topics' ) ) {
-
-            // Extra text
-            $extra = ' ' . sprintf( _n( '(%d hidden)', '(%d hidden)', $deleted, 'bbpress' ), $deleted );
-
-            // No link
-            if ( bbp_get_view_all() ) {
-                $retval .= " $extra";
-
-            // Link
-            } else {
-                $retval .= " <a href='" . esc_url( bbp_add_view_all( bbp_get_forum_permalink( $forum_id ), true ) ) . "'>" . esc_html( $extra ) . "</a>";
-            }
+        if ( ! empty( $deleted_int ) && current_user_can( 'edit_others_topics' ) ) {
+
+            // Hidden text
+            $deleted_num = bbp_get_forum_topic_count_hidden( $forum_id, false );
+            $extra       = ' ' . sprintf( _n( '(+%s hidden)', '(+%s hidden)', $deleted_int, 'bbpress' ), $deleted_num );
+
+            // Hidden link
+            $retval .= ! bbp_get_view_all()
+                ? " <a href='" . esc_url( bbp_add_view_all( $link, true ) ) . "'>" . esc_html( $extra ) . "</a>"
+                : " {$extra}";
         }
 

trunk/src/includes/topics/template.php

@@ -2211 +2211 @@
      * @param int $topic_id Optional. Topic id
      * @uses bbp_get_topic_id() To get the topic id
-     * @uses bbp_get_topic() To get the topic
+     * @uses bbp_get_topic_permalink() To get the topic permalink
      * @uses bbp_get_topic_reply_count() To get the topic reply count
-     * @uses bbp_get_topic_permalink() To get the topic permalink
      * @uses bbp_get_topic_reply_count_hidden() To get the topic hidden
      *                                           reply count
@@ -2222 +2221 @@
      */
     function bbp_get_topic_replies_link( $topic_id = 0 ) {
-
-        $topic    = bbp_get_topic( $topic_id );
-        $topic_id = $topic->ID;
-        $replies  = sprintf( _n( '%s reply', '%s replies', bbp_get_topic_reply_count( $topic_id, true ), 'bbpress' ), bbp_get_topic_reply_count( $topic_id ) );
-        $retval   = '';
+        $topic_id = bbp_get_topic_id( $topic_id );
+        $link     = bbp_get_topic_permalink( $topic_id );
+        $replies  = sprintf( _n( '%s reply', '%s replies', bbp_get_topic_reply_count( $topic_id, true ), 'bbpress' ), bbp_get_topic_reply_count( $topic_id, false ) );
 
         // First link never has view=all
-        if ( bbp_get_view_all( 'edit_others_replies' ) ) {
-            $retval .= "<a href='" . esc_url( bbp_remove_view_all( bbp_get_topic_permalink( $topic_id ) ) ) . "'>" . esc_html( $replies ) . "</a>";
-        } else {
-            $retval .= $replies;
-        }
+        $retval = bbp_get_view_all( 'edit_others_replies' )
+            ? "<a href='" . esc_url( bbp_remove_view_all( $link ) ) . "'>" . esc_html( $replies ) . "</a>"
+            : $replies;
 
         // Any deleted replies?
-        $deleted = bbp_get_topic_reply_count_hidden( $topic_id );
-
-        // This forum has hidden topics
-        if ( ! empty( $deleted ) && current_user_can( 'edit_others_replies' ) ) {
-
-            // Extra text
-            $extra = ' ' . sprintf( _n( '(%d hidden)', '(%d hidden)', $deleted, 'bbpress' ), $deleted );
-
-            // No link
-            if ( bbp_get_view_all() ) {
-                $retval .= " $extra";
-
-            // Link
-            } else {
-                $retval .= " <a href='" . esc_url( bbp_add_view_all( bbp_get_topic_permalink( $topic_id ), true ) ) . "'>" . esc_html( $extra ) . "</a>";
-            }
+        $deleted_int = bbp_get_topic_reply_count_hidden( $topic_id, true  );
+
+        // This topic has hidden replies
+        if ( ! empty( $deleted_int ) && current_user_can( 'edit_others_replies' ) ) {
+
+            // Hidden replies
+            $deleted_num = bbp_get_topic_reply_count_hidden( $topic_id, false );
+            $extra       = ' ' . sprintf( _n( '(+%s hidden)', '(+%s hidden)', $deleted_int, 'bbpress' ), $deleted_num );
+
+            // Hidden link
+            $retval .= ! bbp_get_view_all()
+                ? " <a href='" . esc_url( bbp_add_view_all( $link, true ) ) . "'>" . esc_html( $extra ) . "</a>"
+                : " {$extra}";
         }