<!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][9318] trunk/src: Remove some of our unused/dead variable assignments.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9318">9318</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9318","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-08 22:28:43 +0000 (Thu, 08 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove some of our unused/dead variable assignments.
Identified by scrutinizer-ci.com; https://scrutinizer-ci.com/g/buddypress/BuddyPress/</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityakismetphp">trunk/src/bp-activity/bp-activity-akismet.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfiltersphp">trunk/src/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunksrcbpcorebpcoreclassesphp">trunk/src/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunksrcbpcorebpcorefiltersphp">trunk/src/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplateloaderphp">trunk/src/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#trunksrcbpfriendsbpfriendsactivityphp">trunk/src/bp-friends/bp-friends-activity.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersadminphp">trunk/src/bp-members/bp-members-admin.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagesclassesphp">trunk/src/bp-messages/bp-messages-classes.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagesnotificationsphp">trunk/src/bp-messages/bp-messages-notifications.php</a></li>
<li><a href="#trunksrcbpnotificationsbpnotificationstemplatephp">trunk/src/bp-notifications/bp-notifications-template.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilecachephp">trunk/src/bp-xprofile/bp-xprofile-cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-akismet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-akismet.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-activity/bp-activity-akismet.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'akismet_init' ) && ( empty( $akismet_api_host ) || empty( $akismet_api_port ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> akismet_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_string = $path = $response = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_string = $path = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['blog'] = bp_get_option( 'home' );
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['blog_charset'] = bp_get_option( 'blog_charset' );
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-filters.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-activity/bp-activity-filters.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,8 +528,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $response
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $data['bp_activity_last_recorded'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-admin.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-core/bp-core-admin.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,12 +486,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.7.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function about_screen() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_new_install = ! empty( $_GET['is_new_install'] );
+ list( $display_version ) = explode( '-', bp_get_version() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_new_install = ! empty( $_GET['is_new_install'] );
- $pretty_permalinks_enabled = ! empty( $wp_rewrite->permalink_structure );
- list( $display_version ) = explode( '-', bp_get_version() ); ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php printf( __( 'Welcome to BuddyPress %s', 'buddypress' ), $display_version ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="about-text">
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-classes.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-core/bp-core-classes.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.7.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global BuddyPress $bp Global BuddyPress settings object.
</del><span class="cx" style="display: block; padding: 0 10px"> * @global WPDB $wpdb Global WordPress database access object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function populate_extras() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,8 +624,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Turn user ID's into a query-usable, comma separated value
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ids_sql = implode( ',', wp_parse_id_list( $this->user_ids ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Use this action to independently populate your own custom extras.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2329,7 +2326,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $elements ) ) // nothing to walk
</span><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_field = $this->db_fields['id'];
</del><span class="cx" style="display: block; padding: 0 10px"> $parent_field = $this->db_fields['parent'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // flat display
</span></span></pre></div>
<a id="trunksrcbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-filters.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-core/bp-core-filters.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We use information stored in the CSS class to determine what kind of
</span><span class="cx" style="display: block; padding: 0 10px"> // menu item this is, and how it should be treated
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css_target = preg_match( '/\sbp-(.*)-nav/', implode( ' ', $menu_item->classes), $matches );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match( '/\sbp-(.*)-nav/', implode( ' ', $menu_item->classes), $matches );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this isn't a BP menu item, we can stop here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $matches[1] ) ) {
</span></span></pre></div>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-core/bp-core-functions.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1912,7 +1912,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_args = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $bp_menu_items as $bp_item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_name = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove <span>number</span>
</span><span class="cx" style="display: block; padding: 0 10px"> $item_name = preg_replace( '/([.0-9]+)/', '', $bp_item['name'] );
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template-loader.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-core/bp-core-template-loader.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,8 +442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of possible root level wrapper template files.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_theme_compat_templates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = 0;
- $page_template = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the WordPress Page ID for the current view.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) buddypress()->pages as $component => $bp_page ) {
</span></span></pre></div>
<a id="trunksrcbpfriendsbpfriendsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/bp-friends-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/bp-friends-activity.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-friends/bp-friends-activity.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,16 +282,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $friendship Optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_friends_friendship_accepted_activity( $friendship_id, $initiator_user_id, $friend_user_id, $friendship = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Bail if Activity component is not active
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_is_active( 'activity' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get links to both members profiles
- $initiator_link = bp_core_get_userlink( $initiator_user_id );
- $friend_link = bp_core_get_userlink( $friend_user_id );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Record in activity streams for the initiator
</span><span class="cx" style="display: block; padding: 0 10px"> friends_record_activity( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $initiator_user_id,
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-admin.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-members/bp-members-admin.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,17 +217,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function get_user_id() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // No user ID to start
- $user_id = 0;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // We'll need a user ID when not on the user admin
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $_GET['user_id'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Assume the current user ID
- } else {
- $user_id = get_current_user_id();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return intval( $user_id );
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-members/bp-members-functions.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,9 +596,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * user not found.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_get_user_displayname( $user_id_or_username ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $fullname = '';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id_or_username ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagesclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-classes.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-messages/bp-messages-classes.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id_sql = $pag_sql = $type_sql = $search_sql = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pag_sql = $type_sql = $search_sql = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['limit'] && $r['page'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['limit'] ), intval( $r['limit'] ) );
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-notifications.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-messages/bp-messages-notifications.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_items > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 'multiple';
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( 'You have %d new messages', 'buddypress' ), $total_items );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $amount = 'multiple';
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 'single';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpnotificationsbpnotificationstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-notifications/bp-notifications-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-notifications/bp-notifications-template.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-notifications/bp-notifications-template.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,9 +679,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_the_notification_description() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Setup local variables
- $description = '';
</del><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px"> $notification = $bp->notifications->query_loop->notification;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilecachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-01-08 21:54:28 UTC (rev 9317)
+++ trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-01-08 22:28:43 UTC (rev 9318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,16 +80,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
+ $cache = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_list = $wpdb->get_results( "SELECT object_id, object_type, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE {$where_sql}" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta_list ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_type_caches = array(
- 'group' => array(),
- 'field' => array(),
- 'data' => array(),
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meta_list as $meta ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $oid = $meta->object_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $otype = $meta->object_type;
</span></span></pre>
</div>
</div>
</body>
</html>