<!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][5668] trunk/bp-core/bp-core-template.php: Remove unreferenced globals and prevent debug notices in bp-core-template.php.</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/5668">5668</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-01-29 05:30:10 +0000 (Sun, 29 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unreferenced globals and prevent debug notices in bp-core-template.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (5667 => 5668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2012-01-28 18:31:14 UTC (rev 5667)
+++ trunk/bp-core/bp-core-template.php 2012-01-29 05:30:10 UTC (rev 5668)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+
</ins><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><span class="lines">@@ -243,12 +244,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Generates the basic search form as used in BP-Default's header.
</span><span class="cx"> *
</span><del>- * @global object $bp BuddyPress global settings
</del><span class="cx"> * @return string HTML <select> element
</span><span class="cx"> * @since 1.0
</span><span class="cx"> */
</span><span class="cx"> function bp_search_form_type_select() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> $options = array();
</span><span class="cx">
</span><span class="lines">@@ -405,12 +404,12 @@
</span><span class="cx"> $ending = apply_filters( 'bp_excerpt_append_text', $ending );
</span><span class="cx">
</span><span class="cx"> // Remove shortcodes if necessary
</span><del>- if ( $filter_shortcodes )
</del><ins>+ if ( !empty( $filter_shortcodes ) )
</ins><span class="cx"> $text = strip_shortcodes( $text );
</span><span class="cx">
</span><span class="cx"> // When $html is true, the excerpt should be created without including HTML tags in the
</span><span class="cx"> // excerpt length
</span><del>- if ( $html ) {
</del><ins>+ if ( !empty( $html ) ) {
</ins><span class="cx"> // The text is short enough. No need to truncate
</span><span class="cx"> if ( mb_strlen( preg_replace( '/<.*?>/', '', $text ) ) <= $length ) {
</span><span class="cx"> return $text;
</span><span class="lines">@@ -470,7 +469,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If $exact is false, we can't break on words
</span><del>- if ( !$exact ) {
</del><ins>+ if ( empty( $exact ) ) {
</ins><span class="cx"> $spacepos = mb_strrpos( $truncate, ' ' );
</span><span class="cx"> if ( isset( $spacepos ) ) {
</span><span class="cx"> if ( $html ) {
</span><span class="lines">@@ -980,7 +979,6 @@
</span><span class="cx"> * @return bool True if it's a non-BP page, false otherwise
</span><span class="cx"> */
</span><span class="cx"> function bp_is_blog_page() {
</span><del>- global $wp_query;
</del><span class="cx">
</span><span class="cx"> $is_blog_page = false;
</span><span class="cx">
</span><span class="lines">@@ -1091,8 +1089,6 @@
</span><span class="cx"> /** User **********************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_is_my_profile() {
</span><del>- global $bp;
-
</del><span class="cx"> if ( is_user_logged_in() && bp_loggedin_user_id() == bp_displayed_user_id() )
</span><span class="cx"> $my_profile = true;
</span><span class="cx"> else
</span><span class="lines">@@ -1102,8 +1098,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_user() {
</span><del>- global $bp;
-
</del><span class="cx"> if ( bp_displayed_user_id() )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>