<!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][5723] trunk/bp-core/bp-core-functions.php: Fix unused variables and possible accidental assignments in bp-core-functions.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/5723">5723</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-11 20:43:00 +0000 (Sat, 11 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix unused variables and possible accidental assignments in bp-core-functions.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5722 => 5723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2012-02-11 20:36:05 UTC (rev 5722)
+++ trunk/bp-core/bp-core-functions.php 2012-02-11 20:43:00 UTC (rev 5723)
</span><span class="lines">@@ -128,27 +128,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @since 1.5
</span><del>- *
- * @todo Remove the "Upgrading from an earlier version of BP pre-1.5" block. Temporary measure for
- * people running trunk installations. Leave for a version or two, then remove.
</del><span class="cx"> */
</span><span class="cx"> function bp_core_get_directory_page_ids() {
</span><span class="cx"> $page_ids = bp_get_option( 'bp-pages' );
</span><span class="cx">
</span><del>- // Upgrading from an earlier version of BP pre-1.5
- if ( !isset( $page_ids['members'] ) && $ms_page_ids = get_site_option( 'bp-pages' ) ) {
- $page_blog_id = bp_is_multiblog_mode() ? get_current_blog_id() : bp_get_root_blog_id();
-
- if ( isset( $ms_page_ids[$page_blog_id] ) ) {
- $page_ids = $ms_page_ids[$page_blog_id];
-
- bp_update_option( 'bp-pages', $page_ids );
- }
- }
-
</del><span class="cx"> // Ensure that empty indexes are unset. Should only matter in edge cases
</span><del>- if ( $page_ids && is_array( $page_ids ) ) {
- foreach( (array)$page_ids as $component_name => $page_id ) {
</del><ins>+ if ( !empty( $page_ids ) && is_array( $page_ids ) ) {
+ foreach( (array) $page_ids as $component_name => $page_id ) {
</ins><span class="cx"> if ( empty( $component_name ) || empty( $page_id ) ) {
</span><span class="cx"> unset( $page_ids[$component_name] );
</span><span class="cx"> }
</span><span class="lines">@@ -188,7 +174,8 @@
</span><span class="cx"> $pages = new stdClass;
</span><span class="cx">
</span><span class="cx"> // Get pages and IDs
</span><del>- if ( $page_ids = bp_core_get_directory_page_ids() ) {
</del><ins>+ $page_ids = bp_core_get_directory_page_ids();
+ if ( !empty( $page_ids ) ) {
</ins><span class="cx">
</span><span class="cx"> // Always get page data from the root blog, except on multiblog mode, when it comes
</span><span class="cx"> // from the current blog
</span><span class="lines">@@ -196,8 +183,8 @@
</span><span class="cx"> $page_ids_sql = implode( ',', (array)$page_ids );
</span><span class="cx"> $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
</span><span class="cx">
</span><del>- foreach ( (array)$page_ids as $component_id => $page_id ) {
- foreach ( (array)$page_names as $page_name ) {
</del><ins>+ foreach ( (array) $page_ids as $component_id => $page_id ) {
+ foreach ( (array) $page_names as $page_name ) {
</ins><span class="cx"> if ( $page_name->ID == $page_id ) {
</span><span class="cx"> $pages->{$component_id}->name = $page_name->post_name;
</span><span class="cx"> $pages->{$component_id}->id = $page_name->ID;
</span><span class="lines">@@ -211,7 +198,7 @@
</span><span class="cx"> $page_name->post_parent = $parent[0]->post_parent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $pages->{$component_id}->slug = implode( '/', array_reverse( (array)$slug ) );
</del><ins>+ $pages->{$component_id}->slug = implode( '/', array_reverse( (array) $slug ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unset( $slug );
</span><span class="lines">@@ -442,7 +429,8 @@
</span><span class="cx"> $seconds = $chunks[$i][0];
</span><span class="cx">
</span><span class="cx"> // Finding the biggest chunk (if the chunk fits, break)
</span><del>- if ( ( $count = floor($since / $seconds) ) != 0 ) {
</del><ins>+ $count = floor( $since / $seconds );
+ if ( 0 != $count ) {
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -459,16 +447,17 @@
</span><span class="cx"> // Step two: the second chunk
</span><span class="cx"> if ( $i + 2 < $j ) {
</span><span class="cx"> $seconds2 = $chunks[$i + 1][0];
</span><del>- $name2 = $chunks[$i + 1][1];
</del><ins>+ $name2 = $chunks[$i + 1][1];
+ $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 );
</ins><span class="cx">
</span><del>- if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
- // Add to output var
- $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
</del><ins>+ // Add to output var
+ if ( 0 != $count ) {
+ $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $name2 : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // No output, so happened right now
</span><del>- if ( !(int)trim( $output ) ) {
</del><ins>+ if ( ! (int) trim( $output ) ) {
</ins><span class="cx"> $output = $right_now_text;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>