Changeset 6374

Timestamp:

10/01/2012 09:04:40 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Blogs:

• Tweak the way new latest_blog template tags work, to always be filterable even if no result exists.
• Have latest_content use _get_ function, and remove extra filter to prevent confusion.
• Remove CDATA str_replace, as it won't be used in feeds.
• Fix @since phpdoc order.
• Switch some $bp globals to using buddypress().
• See: r6372.

File:

• trunk/bp-blogs/bp-blogs-template.php (modified) (8 diffs)

trunk/bp-blogs/bp-blogs-template.php

@@ -31 +31 @@
      */
     function bp_get_blogs_slug() {
-        global $bp;
-        return apply_filters( 'bp_get_blogs_slug', $bp->blogs->slug );
+        return apply_filters( 'bp_get_blogs_slug', buddypress()->blogs->slug );
     }
 
@@ -55 +54 @@
      */
     function bp_get_blogs_root_slug() {
-        global $bp;
-        return apply_filters( 'bp_get_blogs_root_slug', $bp->blogs->root_slug );
+        return apply_filters( 'bp_get_blogs_root_slug', buddypress()->blogs->root_slug );
     }
 
@@ -357 +355 @@
         global $blogs_template;
 
-        if ( null == $blogs_template->blog->latest_post )
-            return false;
-
-        return apply_filters( 'bp_get_blog_latest_post', sprintf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . $blogs_template->blog->latest_post->guid . '">' . apply_filters( 'the_title', $blogs_template->blog->latest_post->post_title ) . '</a>' ) );
+        $retval = bp_get_blog_latest_post_title();
+
+        if ( ! empty( $retval ) )
+            $retval = sprintf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . $blogs_template->blog->latest_post->guid . '">' . apply_filters( 'the_title', $retval ) . '</a>' );
+
+        return apply_filters( 'bp_get_blog_latest_post', $retval );
     }
 
@@ -366 +366 @@
  * Prints this site's latest article's title
  *
+ * @since BuddyPress (1.7)
+ *
  * @see bp_get_blog_latest_post_title()
- * @since BuddyPress (1.7)
  */
 function bp_blog_latest_post_title() {
@@ -375 +376 @@
      * Returns this site's latest article's title
      *
+     * @since BuddyPress (1.7)
+     *
      * @global BP_Blogs_Template
      * @return string
-     * @since BuddyPress (1.7)
      */
     function bp_get_blog_latest_post_title() {
         global $blogs_template;
 
-        if ( empty( $blogs_template->blog->latest_post ) )
-            return '';
-
-        return apply_filters( 'bp_get_blog_latest_post_title', $blogs_template->blog->latest_post->post_title );
+        $retval = '';
+
+        if ( ! empty( $blogs_template->blog->latest_post ) && ! empty( $blogs_template->blog->latest_post->post_title ) )
+            $retval = $blogs_template->blog->latest_post->post_title;
+
+        return apply_filters( 'bp_get_blog_latest_post_title', $retval );
     }
 
@@ -391 +395 @@
  * Prints this site's latest article's content
  *
- * @see bp_get_blog_latest_post_content()
  * @since BuddyPress (1.7)
+ *
+ * @uses bp_get_blog_latest_post_content()
  */
 function bp_blog_latest_post_content() {
-    $content = bp_get_blog_latest_post_content();
-    $content = apply_filters( 'bp_blog_latest_post_content', $content );
-    $content = str_replace( ']]>', ']]&gt;', $content );
-    echo $content;
+    echo bp_get_blog_latest_post_content();
 }
     /**
      * Returns this site's latest article's content
      *
+     * @since BuddyPress (1.7)
+     *
      * @global BP_Blogs_Template
      * @return string
-     * @since BuddyPress (1.7)
      */
     function bp_get_blog_latest_post_content() {
         global $blogs_template;
 
-        if ( empty( $blogs_template->blog->latest_post ) )
-            return '';
-
-        return apply_filters( 'bp_get_blog_latest_post_content', $blogs_template->blog->latest_post->post_content );
+        $retval = '';
+
+        if ( ! empty( $blogs_template->blog->latest_post ) && ! empty( $blogs_template->blog->latest_post->post_content ) )
+            $retval = $blogs_template->blog->latest_post->post_content;
+
+        return apply_filters( 'bp_get_blog_latest_post_content', $retval );
     }
 
 /**
  * Prints this site's latest article's featured image
+ *
+ * @since BuddyPress (1.7)
  *
  * @param string $size Image version to return. Either "thumbnail", "medium", "large", "post-thumbnail".
  * @see bp_get_blog_latest_post_content()
- * @since BuddyPress (1.7)
  */
 function bp_blog_latest_post_featured_image( $size = 'thumbnail' ) {
@@ -428 +434 @@
     /**
      * Returns this site's latest article's featured image
+     *
+     * @since BuddyPress (1.7)
      *
      * @global BP_Blogs_Template
      * @param string $size Image version to return. Either "thumbnail", "medium", "large", "post-thumbnail".
      * @return string
-     * @since BuddyPress (1.7)
      */
     function bp_get_blog_latest_post_featured_image( $size = 'thumbnail' ) {
         global $blogs_template;
 
-        if ( empty( $blogs_template->blog->latest_post->images[$size] ) )
-            return '';
-
-        return apply_filters( 'bp_get_blog_latest_post_featured_image', $blogs_template->blog->latest_post->images[$size] );
+        $retval = '';
+
+        if ( ! empty( $blogs_template->blog->latest_post ) && ! empty( $blogs_template->blog->latest_post->images[$size] ) )
+            $retval = $blogs_template->blog->latest_post->images[$size];
+
+        return apply_filters( 'bp_get_blog_latest_post_featured_image', $retval );
     }
 
@@ -685 +694 @@
 
 <?php
+
+    // @todo where does $current_tab come from?
     do_action( 'bp_blogs_blog_tabs', $current_tab );
 }