Changeset 4066

Timestamp:

02/23/2011 10:13:47 AM (14 years ago)

Author:

johnjamesjacoby

Message:

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.

Location:

branches/1.2

Files:

• bp-activity.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-admin.php (modified) (9 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-admin.php (modified) (3 diffs)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)
• bp-messages.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (2 diffs)
• license.txt (modified) (1 diff)
• readme.txt (modified) (4 diffs)

branches/1.2/bp-activity.php

@@ -99 +99 @@
         bp_activity_install();
 }
-add_action( 'admin_menu', 'bp_activity_check_installed' );
-add_action( 'network_admin_menu', 'bp_activity_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_activity_check_installed' );
 
 function bp_activity_setup_root_component() {

branches/1.2/bp-blogs.php

@@ -61 +61 @@
     }
 }
-add_action( 'admin_menu', 'bp_blogs_check_installed' );
-add_action( 'network_admin_menu', 'bp_blogs_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_blogs_check_installed' );
 
 function bp_blogs_setup_globals() {

branches/1.2/bp-core.php

@@ -285 +285 @@
         bp_core_install();
 }
-add_action( 'admin_menu', 'bp_core_check_installed' );
-add_action( 'network_admin_menu', 'bp_core_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_check_installed' );
 
 /**
@@ -318 +317 @@
     add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
 }
-add_action( 'admin_menu', 'bp_core_add_admin_menu' );
-add_action( 'network_admin_menu', 'bp_core_add_admin_menu' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu' );
 
 /**

branches/1.2/bp-core/bp-core-admin.php

@@ -44 +44 @@
                 <?php if ( function_exists( 'xprofile_install' ) ) :?>
                 <tr>
-                    <th scope="row"><?php _e( 'Base profile group name', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Base profile group name', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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') ?>" />
@@ -50 +50 @@
                 </tr>
                 <tr>
-                    <th scope="row"><?php _e( 'Full Name field name', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Full Name field name', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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') ?>" />
@@ -56 +56 @@
                 </tr>
                 <tr>
-                    <th scope="row"><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -64 +64 @@
                 <?php endif; ?>
                 <tr>
-                    <th scope="row"><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -71 +71 @@
                 </tr>
                 <tr>
-                    <th scope="row"><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -78 +78 @@
                 </tr>
                 <tr>
-                    <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -86 +86 @@
                 <?php if ( function_exists( 'bp_forums_setup') ) : ?>
                 <tr>
-                    <th scope="row"><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -95 +95 @@
                 <?php if ( function_exists( 'bp_activity_install') ) : ?>
                 <tr>
-                    <th scope="row"><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</th>
+                    <th scope="row"><p><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</p></th>
                     <td>
                         <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;
@@ -104 +104 @@
 
                 <tr>
-                    <th scope="row"><?php _e( 'Default User Avatar', 'buddypress' ) ?></th>
+                    <th scope="row"><p><?php _e( 'Default User Avatar', 'buddypress' ) ?></p></th>
                     <td>
                         <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>

branches/1.2/bp-core/bp-core-cssjs.php

@@ -45 +45 @@
 <?php
 }
-add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_head', 'bp_core_admin_menu_icon_css' );
 
 function bp_core_confirmation_js() {

branches/1.2/bp-forums.php

@@ -103 +103 @@
     add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
 }
-add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
-add_action( 'network_admin_menu', 'bp_forums_add_admin_menu' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_forums_add_admin_menu' );
 
 /* Forum Functions */

branches/1.2/bp-forums/bp-forums-admin.php

@@ -12 +12 @@
                 <p><?php _e( 'Settings Saved.', 'buddypress' ) ?></p>
             </div>
-        <?php endif; ?>
-
-        <?php
+        <?php endif;
 
         if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) {
             update_site_option( 'bb-config-location', false );
             bp_forums_bbpress_install_wizard();
-        } 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' ) ); ?>
+        } 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 ); ?>
             <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>
+
         <?php
         }
@@ -30 +32 @@
 
 function bp_forums_bbpress_install_wizard() {
-    $post_url = site_url( 'wp-admin/admin.php?page=bb-forums-setup' );
+    $url      = 'admin.php?page=bb-forums-setup';
+    $post_url = is_multisite() ? network_admin_url( $url ) : admin_url( $url );
 
     switch( $_REQUEST['step'] ) {
@@ -68 +71 @@
                         // Just write the contents to screen
                         _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' );
-                        ?><code style="display:block; margin-top: 30px;"><pre><?php echo htmlspecialchars( $result ) ?></pre></code><?php
+                        ?><br /><textarea cols="110" rows="50" style="margin: 10px 0 50px 0;"><?php echo htmlspecialchars( $result ) ?></textarea><?php
                         break;
                 }

branches/1.2/bp-friends.php

@@ -62 +62 @@
         friends_install();
 }
-add_action( 'admin_menu', 'friends_check_installed' );
-add_action( 'network_admin_menu', 'friends_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'friends_check_installed' );
 
 function friends_setup_nav() {

branches/1.2/bp-groups.php

@@ -117 +117 @@
         groups_install();
 }
-add_action( 'admin_menu', 'groups_check_installed' );
-add_action( 'network_admin_menu', 'groups_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'groups_check_installed' );
 
 function groups_setup_nav() {

branches/1.2/bp-loader.php

@@ -5 +5 @@
 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.
 Author: The BuddyPress Community
-Version: 1.2.7
+Version: 1.2.8
 Author URI: http://buddypress.org/community/members/
-Site Wide Only: true
 Network: true
 */
 
-define( 'BP_VERSION', '1.2.7' );
+define( 'BP_VERSION', '1.2.8' );
 
 /***

branches/1.2/bp-messages.php

@@ -97 +97 @@
         messages_install();
 }
-add_action( 'admin_menu', 'messages_check_installed' );
-add_action( 'network_admin_menu', 'messages_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'messages_check_installed' );
 
 function messages_setup_nav() {

branches/1.2/bp-xprofile.php

@@ -152 +152 @@
         xprofile_install();
 }
-add_action( 'admin_menu', 'xprofile_add_admin_menu' );
-add_action( 'network_admin_menu', 'xprofile_add_admin_menu' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
 
 /**

branches/1.2/bp-xprofile/bp-xprofile-cssjs.php

@@ -9 +9 @@
         wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
 }
-add_action( 'admin_menu', 'xprofile_add_admin_css' );
-add_action( 'network_admin_menu', 'xprofile_add_admin_css' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_css' );
 
 function xprofile_add_admin_js() {
@@ -22 +21 @@
     }
 }
-add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
-add_action( 'network_admin_menu', 'xprofile_add_admin_js', 1 );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_js', 1 );
 
 ?>

branches/1.2/license.txt

@@ -3 +3 @@
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.

branches/1.2/readme.txt

@@ -2 +2 @@
 Contributors: apeatling, johnjamesjacoby, MrMaz, DJPaul, boonebgorges
 Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
-Requires at least: 3.0
-Tested up to: 3.0.3
-Stable tag: 1.2.7
+Requires at least: 3.1
+Tested up to: 3.1
+Stable tag: 1.2.8
 
 == Description ==
@@ -62 +62 @@
 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.
 
-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>.
+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>.
 
 = Will this work on standard WordPress and WordPress MU? =
@@ -96 +96 @@
 == Languages ==
 
-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.
+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.
 
 *   <a href="http://br.buddypress.org/">Brasil</a>
@@ -118 +118 @@
 *   <a href="http://tw.buddypress.org/">正體中文</a>
 
-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.
+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.
 
 == Upgrade Notice ==
 
-= 1.2.7 =
-Fixes over 10 bugs.
+= 1.2.8 =
+Compatibility with WordPress 3.1
 
 == Changelog ==