<!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][4066] branches/1.2: Update branch version numbers to 1.2.8 and required WordPress version to 3.1.</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>4066</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-23 10:13:47 +0000 (Wed, 23 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update branch version numbers to 1.2.8 and required WordPress version to 3.1. Backport WordPress network admin compat code from trunk. Update and fix spelling errors in readme.txt. Update address in license.txt. Update bbPress installer for network admin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
<li><a href="#branches12bpblogsphp">branches/1.2/bp-blogs.php</a></li>
<li><a href="#branches12bpcorebpcoreadminphp">branches/1.2/bp-core/bp-core-admin.php</a></li>
<li><a href="#branches12bpcorebpcorecssjsphp">branches/1.2/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
<li><a href="#branches12bpforumsbpforumsadminphp">branches/1.2/bp-forums/bp-forums-admin.php</a></li>
<li><a href="#branches12bpforumsphp">branches/1.2/bp-forums.php</a></li>
<li><a href="#branches12bpfriendsphp">branches/1.2/bp-friends.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bploaderphp">branches/1.2/bp-loader.php</a></li>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
<li><a href="#branches12bpxprofilebpxprofilecssjsphp">branches/1.2/bp-xprofile/bp-xprofile-cssjs.php</a></li>
<li><a href="#branches12bpxprofilephp">branches/1.2/bp-xprofile.php</a></li>
<li><a href="#branches12licensetxt">branches/1.2/license.txt</a></li>
<li><a href="#branches12readmetxt">branches/1.2/readme.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-activity.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -98,8 +98,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION )
</span><span class="cx"> bp_activity_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_activity_check_installed' );
-add_action( 'network_admin_menu', 'bp_activity_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_activity_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_setup_root_component() {
</span><span class="cx"> /* Register 'activity' as a root component (for RSS feed use) */
</span></span></pre></div>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-blogs.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -60,8 +60,7 @@
</span><span class="cx"> bp_blogs_install();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_blogs_check_installed' );
-add_action( 'network_admin_menu', 'bp_blogs_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_blogs_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function bp_blogs_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span></span></pre></div>
<a id="branches12bpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-admin.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-admin.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-core/bp-core-admin.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -43,19 +43,19 @@
</span><span class="cx"> <tbody>
</span><span class="cx"> <?php if ( function_exists( 'xprofile_install' ) ) :?>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Base profile group name', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Base profile group name', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name="bp-admin[bp-xprofile-base-group-name]" id="bp-xprofile-base-group-name" value="<?php echo get_site_option('bp-xprofile-base-group-name') ?>" />
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Full Name field name', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Full Name field name', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name="bp-admin[bp-xprofile-fullname-field-name]" id="bp-xprofile-fullname-field-name" value="<?php echo get_site_option('bp-xprofile-fullname-field-name') ?>" />
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-profile-sync]"<?php if ( (int)get_site_option( 'bp-disable-profile-sync' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-profile-sync" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-profile-sync]"<?php if ( !(int)get_site_option( 'bp-disable-profile-sync' ) || '' == get_site_option( 'bp-disable-profile-sync' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-profile-sync" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="lines">@@ -63,21 +63,21 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[hide-loggedout-adminbar]"<?php if ( (int)get_site_option( 'hide-loggedout-adminbar' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-hide-loggedout-adminbar-yes" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[hide-loggedout-adminbar]"<?php if ( !(int)get_site_option( 'hide-loggedout-adminbar' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-hide-loggedout-adminbar-no" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-avatar-uploads]"<?php if ( (int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-disable-avatar-uploads-yes" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-avatar-uploads]"<?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-disable-avatar-uploads-no" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( (int)get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( !(int)get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php if ( function_exists( 'bp_forums_setup') ) : ?>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-forum-directory]"<?php if ( (int)get_site_option( 'bp-disable-forum-directory' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-forum-directory" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-forum-directory]"<?php if ( !(int)get_site_option( 'bp-disable-forum-directory' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-forum-directory" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( function_exists( 'bp_activity_install') ) : ?>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</th>
</del><ins>+ <th scope="row"><p><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-blogforum-comments]"<?php if ( (int)get_site_option( 'bp-disable-blogforum-comments' ) || false === get_site_option( 'bp-disable-blogforum-comments' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-blogforum-comments" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-blogforum-comments]"<?php if ( !(int)get_site_option( 'bp-disable-blogforum-comments' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-blogforum-comments" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Default User Avatar', 'buddypress' ) ?></th>
</del><ins>+ <th scope="row"><p><?php _e( 'Default User Avatar', 'buddypress' ) ?></p></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <p><?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address', 'buddypress' ) ?></p>
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-cssjs.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-cssjs.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-core/bp-core-cssjs.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_head', 'bp_core_admin_menu_icon_css' );
</ins><span class="cx">
</span><span class="cx"> function bp_core_confirmation_js() {
</span><span class="cx"> global $current_blog;
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-core.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -284,8 +284,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-core-db-version' ) < BP_CORE_DB_VERSION )
</span><span class="cx"> bp_core_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_core_check_installed' );
-add_action( 'network_admin_menu', 'bp_core_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_check_installed' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_add_admin_menu()
</span><span class="lines">@@ -317,8 +316,7 @@
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __( 'General Settings', 'buddypress'), __( 'General Settings', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_settings' );
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_core_add_admin_menu' );
-add_action( 'network_admin_menu', 'bp_core_add_admin_menu' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_is_root_component()
</span></span></pre></div>
<a id="branches12bpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums/bp-forums-admin.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums/bp-forums-admin.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-forums/bp-forums-admin.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -11,16 +11,18 @@
</span><span class="cx"> <div id="message" class="updated fade">
</span><span class="cx"> <p><?php _e( 'Settings Saved.', 'buddypress' ) ?></p>
</span><span class="cx"> </div>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif;
</ins><span class="cx">
</span><del>- <?php
-
</del><span class="cx"> if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) {
</span><span class="cx"> update_site_option( 'bb-config-location', false );
</span><span class="cx"> bp_forums_bbpress_install_wizard();
</span><del>- } else { ?>
- <p><?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can <a href="%s" title="Reinstall bbPress">re-install</a>', 'buddypress' ), site_url( 'wp-admin/admin.php?page=bb-forums-setup&reinstall=1' ) ); ?>
</del><ins>+ } else {
+ $url = 'admin.php?page=bb-forums-setup&reinstall=1';
+ $reinstall = is_multisite() ? network_admin_url( $url ) : admin_url( $url ); ?>
+
+ <p><?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can <a href="%s" title="Reinstall bbPress">re-install</a>', 'buddypress' ), $reinstall ); ?>
</ins><span class="cx"> <p><?php _e( 'NOTE: The forums directory will only work if your bbPress tables are in the same database as your WordPress tables. If you are not using an existing bbPress install you can ignore this message.', 'buddypress' ) ?></p>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -29,7 +31,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_forums_bbpress_install_wizard() {
</span><del>- $post_url = site_url( 'wp-admin/admin.php?page=bb-forums-setup' );
</del><ins>+ $url = 'admin.php?page=bb-forums-setup';
+ $post_url = is_multisite() ? network_admin_url( $url ) : admin_url( $url );
</ins><span class="cx">
</span><span class="cx"> switch( $_REQUEST['step'] ) {
</span><span class="cx"> case 'existing':
</span><span class="lines">@@ -67,7 +70,7 @@
</span><span class="cx"> default:
</span><span class="cx"> // Just write the contents to screen
</span><span class="cx"> _e( 'A configuration file could not be created. No problem, but you will need to save the text shown below into a file named <code>bb-config.php</code> in the root directory of your WordPress installation before you can start using the forum functionality.', 'buddypress' );
</span><del>- ?><code style="display:block; margin-top: 30px;"><pre><?php echo htmlspecialchars( $result ) ?></pre></code><?php
</del><ins>+ ?><br /><textarea cols="110" rows="50" style="margin: 10px 0 50px 0;"><?php echo htmlspecialchars( $result ) ?></textarea><?php
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="branches12bpforumsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-forums.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -102,8 +102,7 @@
</span><span class="cx"> /* Add the administration tab under the "Site Admin" tab for site administrators */
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
-add_action( 'network_admin_menu', 'bp_forums_add_admin_menu' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_forums_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /* Forum Functions */
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-friends.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -61,8 +61,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-friends-db-version' ) < BP_FRIENDS_DB_VERSION )
</span><span class="cx"> friends_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'friends_check_installed' );
-add_action( 'network_admin_menu', 'friends_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'friends_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function friends_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-groups.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -116,8 +116,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-groups-db-version' ) < BP_GROUPS_DB_VERSION )
</span><span class="cx"> groups_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'groups_check_installed' );
-add_action( 'network_admin_menu', 'groups_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'groups_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function groups_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bploaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-loader.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-loader.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-loader.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -4,13 +4,12 @@
</span><span class="cx"> Plugin URI: http://buddypress.org
</span><span class="cx"> Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
</span><span class="cx"> Author: The BuddyPress Community
</span><del>-Version: 1.2.7
</del><ins>+Version: 1.2.8
</ins><span class="cx"> Author URI: http://buddypress.org/community/members/
</span><del>-Site Wide Only: true
</del><span class="cx"> Network: true
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define( 'BP_VERSION', '1.2.7' );
</del><ins>+define( 'BP_VERSION', '1.2.8' );
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * This file will load in each BuddyPress component based on which
</span></span></pre></div>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-messages.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -96,8 +96,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-messages-db-version' ) < BP_MESSAGES_DB_VERSION )
</span><span class="cx"> messages_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'messages_check_installed' );
-add_action( 'network_admin_menu', 'messages_check_installed' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'messages_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function messages_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="branches12bpxprofilebpxprofilecssjsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile/bp-xprofile-cssjs.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile/bp-xprofile-cssjs.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-xprofile/bp-xprofile-cssjs.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -8,8 +8,7 @@
</span><span class="cx"> if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false )
</span><span class="cx"> wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'xprofile_add_admin_css' );
-add_action( 'network_admin_menu', 'xprofile_add_admin_css' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_css' );
</ins><span class="cx">
</span><span class="cx"> function xprofile_add_admin_js() {
</span><span class="cx"> // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
</span><span class="lines">@@ -21,7 +20,6 @@
</span><span class="cx"> wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
-add_action( 'network_admin_menu', 'xprofile_add_admin_js', 1 );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_js', 1 );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/bp-xprofile.php 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -151,8 +151,7 @@
</span><span class="cx"> if ( get_site_option( 'bp-xprofile-db-version' ) < BP_XPROFILE_DB_VERSION )
</span><span class="cx"> xprofile_install();
</span><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'xprofile_add_admin_menu' );
-add_action( 'network_admin_menu', 'xprofile_add_admin_menu' );
</del><ins>+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * xprofile_setup_nav()
</span></span></pre></div>
<a id="branches12licensetxt"></a>
<div class="modfile"><h4>Modified: branches/1.2/license.txt (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/license.txt 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/license.txt 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -2,7 +2,8 @@
</span><span class="cx"> Version 2, June 1991
</span><span class="cx">
</span><span class="cx"> Copyright (C) 1989, 1991 Free Software Foundation, Inc.
</span><del>- 675 Mass Ave, Cambridge, MA 02139, USA
</del><ins>+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
</ins><span class="cx"> Everyone is permitted to copy and distribute verbatim copies
</span><span class="cx"> of this license document, but changing it is not allowed.
</span><span class="cx">
</span></span></pre></div>
<a id="branches12readmetxt"></a>
<div class="modfile"><h4>Modified: branches/1.2/readme.txt (4065 => 4066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/readme.txt 2011-02-21 16:30:29 UTC (rev 4065)
+++ branches/1.2/readme.txt 2011-02-23 10:13:47 UTC (rev 4066)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> === Plugin Name ===
</span><span class="cx"> Contributors: apeatling, johnjamesjacoby, MrMaz, DJPaul, boonebgorges
</span><span class="cx"> Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
</span><del>-Requires at least: 3.0
-Tested up to: 3.0.3
-Stable tag: 1.2.7
</del><ins>+Requires at least: 3.1
+Tested up to: 3.1
+Stable tag: 1.2.8
</ins><span class="cx">
</span><span class="cx"> == Description ==
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> Of course! First install and activate BuddyPress, then download and activate the <a href="http://wordpress.org/extend/plugins/bp-template-pack/">template extension pack</a>. This plugin will run you through the process step-by-step.
</span><span class="cx">
</span><del>-Be sure to also try out the default theme bundled with BuddyPress. It provides all the awesome features of a standard WordPress blog, but also integrates the BuddyPress features both seamlessly and beautfully. It's also really easy to modify with custom header support, widget support and via a <a href="http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/">child theme</a>.
</del><ins>+Be sure to also try out the default theme bundled with BuddyPress. It provides all the awesome features of a standard WordPress blog, but also integrates the BuddyPress features both seamlessly and beautifully. It's also really easy to modify with custom header support, widget support and via a <a href="http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/">child theme</a>.
</ins><span class="cx">
</span><span class="cx"> = Will this work on standard WordPress and WordPress MU? =
</span><span class="cx">
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> == Languages ==
</span><span class="cx">
</span><del>-BuddyPress is available in more than 20 languages. For more information about BuddyPress in your language please select a langauge site from the list below. Is your language missing? Please send a message to the <a href="http://lists.automattic.com/mailman/listinfo/wp-polyglots">WP-Polygots</a> mailing list and request for your language to be set up.
</del><ins>+BuddyPress is available in more than 20 languages. For more information about BuddyPress in your language please select a language site from the list below. Is your language missing? Please send a message to the <a href="http://lists.automattic.com/mailman/listinfo/wp-polyglots">WP-Polygots</a> mailing list and request for your language to be set up.
</ins><span class="cx">
</span><span class="cx"> * <a href="http://br.buddypress.org/">Brasil</a>
</span><span class="cx"> * <a href="http://ca.buddypress.org/">Català</a>
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx"> * <a href="http://ko.buddypress.org/">한국어</a>
</span><span class="cx"> * <a href="http://tw.buddypress.org/">正體中文</a>
</span><span class="cx">
</span><del>-The <a href="http://i18n.svn.buddypress.org/">BuddyPress langauge file repository</a> includes some language that have not yet set up a localization site.
</del><ins>+The <a href="http://i18n.svn.buddypress.org/">BuddyPress language file repository</a> includes some language that have not yet set up a localization site.
</ins><span class="cx">
</span><span class="cx"> == Upgrade Notice ==
</span><span class="cx">
</span><del>-= 1.2.7 =
-Fixes over 10 bugs.
</del><ins>+= 1.2.8 =
+Compatibility with WordPress 3.1
</ins><span class="cx">
</span><span class="cx"> == Changelog ==
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>