<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][6374] trunk/bp-blogs/bp-blogs-template.php: Blogs:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6374">6374</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-10-01 21:04:40 +0000 (Mon, 01 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogstemplatephp">trunk/bp-blogs/bp-blogs-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-template.php (6373 => 6374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-template.php 2012-10-01 20:36:31 UTC (rev 6373)
+++ trunk/bp-blogs/bp-blogs-template.php 2012-10-01 21:04:40 UTC (rev 6374)
</span><span class="lines">@@ -30,8 +30,7 @@
</span><span class="cx"> * @since BuddyPress (1.5)
</span><span class="cx"> */
</span><span class="cx"> function bp_get_blogs_slug() {
</span><del>- global $bp;
- return apply_filters( 'bp_get_blogs_slug', $bp->blogs->slug );
</del><ins>+ return apply_filters( 'bp_get_blogs_slug', buddypress()->blogs->slug );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -54,8 +53,7 @@
</span><span class="cx"> * @since BuddyPress (1.5)
</span><span class="cx"> */
</span><span class="cx"> function bp_get_blogs_root_slug() {
</span><del>- global $bp;
- return apply_filters( 'bp_get_blogs_root_slug', $bp->blogs->root_slug );
</del><ins>+ return apply_filters( 'bp_get_blogs_root_slug', buddypress()->blogs->root_slug );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -356,17 +354,20 @@
</span><span class="cx"> function bp_get_blog_latest_post() {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- if ( null == $blogs_template->blog->latest_post )
- return false;
</del><ins>+ $retval = bp_get_blog_latest_post_title();
</ins><span class="cx">
</span><del>- 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>' ) );
</del><ins>+ 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prints this site's latest article's title
</span><span class="cx"> *
</span><ins>+ * @since BuddyPress (1.7)
+ *
</ins><span class="cx"> * @see bp_get_blog_latest_post_title()
</span><del>- * @since BuddyPress (1.7)
</del><span class="cx"> */
</span><span class="cx"> function bp_blog_latest_post_title() {
</span><span class="cx"> echo bp_get_blog_latest_post_title();
</span><span class="lines">@@ -374,53 +375,58 @@
</span><span class="cx"> /**
</span><span class="cx"> * Returns this site's latest article's title
</span><span class="cx"> *
</span><ins>+ * @since BuddyPress (1.7)
+ *
</ins><span class="cx"> * @global BP_Blogs_Template
</span><span class="cx"> * @return string
</span><del>- * @since BuddyPress (1.7)
</del><span class="cx"> */
</span><span class="cx"> function bp_get_blog_latest_post_title() {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- if ( empty( $blogs_template->blog->latest_post ) )
- return '';
</del><ins>+ $retval = '';
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_blog_latest_post_title', $blogs_template->blog->latest_post->post_title );
</del><ins>+ 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prints this site's latest article's content
</span><span class="cx"> *
</span><del>- * @see bp_get_blog_latest_post_content()
</del><span class="cx"> * @since BuddyPress (1.7)
</span><ins>+ *
+ * @uses bp_get_blog_latest_post_content()
</ins><span class="cx"> */
</span><span class="cx"> function bp_blog_latest_post_content() {
</span><del>- $content = bp_get_blog_latest_post_content();
- $content = apply_filters( 'bp_blog_latest_post_content', $content );
- $content = str_replace( ']]>', ']]&gt;', $content );
- echo $content;
</del><ins>+ echo bp_get_blog_latest_post_content();
</ins><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Returns this site's latest article's content
</span><span class="cx"> *
</span><ins>+ * @since BuddyPress (1.7)
+ *
</ins><span class="cx"> * @global BP_Blogs_Template
</span><span class="cx"> * @return string
</span><del>- * @since BuddyPress (1.7)
</del><span class="cx"> */
</span><span class="cx"> function bp_get_blog_latest_post_content() {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- if ( empty( $blogs_template->blog->latest_post ) )
- return '';
</del><ins>+ $retval = '';
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_blog_latest_post_content', $blogs_template->blog->latest_post->post_content );
</del><ins>+ 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prints this site's latest article's featured image
</span><span class="cx"> *
</span><ins>+ * @since BuddyPress (1.7)
+ *
</ins><span class="cx"> * @param string $size Image version to return. Either "thumbnail", "medium", "large", "post-thumbnail".
</span><span class="cx"> * @see bp_get_blog_latest_post_content()
</span><del>- * @since BuddyPress (1.7)
</del><span class="cx"> */
</span><span class="cx"> function bp_blog_latest_post_featured_image( $size = 'thumbnail' ) {
</span><span class="cx"> echo bp_get_blog_latest_post_featured_image( $size );
</span><span class="lines">@@ -428,18 +434,21 @@
</span><span class="cx"> /**
</span><span class="cx"> * Returns this site's latest article's featured image
</span><span class="cx"> *
</span><ins>+ * @since BuddyPress (1.7)
+ *
</ins><span class="cx"> * @global BP_Blogs_Template
</span><span class="cx"> * @param string $size Image version to return. Either "thumbnail", "medium", "large", "post-thumbnail".
</span><span class="cx"> * @return string
</span><del>- * @since BuddyPress (1.7)
</del><span class="cx"> */
</span><span class="cx"> function bp_get_blog_latest_post_featured_image( $size = 'thumbnail' ) {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- if ( empty( $blogs_template->blog->latest_post->images[$size] ) )
- return '';
</del><ins>+ $retval = '';
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_blog_latest_post_featured_image', $blogs_template->blog->latest_post->images[$size] );
</del><ins>+ 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blog_hidden_fields() {
</span><span class="lines">@@ -684,6 +693,8 @@
</span><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> <?php
</span><ins>+
+ // @todo where does $current_tab come from?
</ins><span class="cx"> do_action( 'bp_blogs_blog_tabs', $current_tab );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>