Skip to:
Content

BuddyPress.org

Changes from tags/1.2.8 at r4072 to tags/1.2.7 at r4072


Ignore:
Location:
tags/1.2.7
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • tags/1.2.7/bp-activity.php

    r4072 r4072  
    9999        bp_activity_install();
    100100}
    101 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_activity_check_installed' );
     101add_action( 'admin_menu', 'bp_activity_check_installed' );
    102102
    103103function bp_activity_setup_root_component() {

  • tags/1.2.7/bp-blogs.php

    r4072 r4072  
    6161    }
    6262}
    63 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_blogs_check_installed' );
     63add_action( 'admin_menu', 'bp_blogs_check_installed' );
    6464
    6565function bp_blogs_setup_globals() {

  • tags/1.2.7/bp-core.php

    r4072 r4072  
    285285        bp_core_install();
    286286}
    287 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_check_installed' );
     287add_action( 'admin_menu', 'bp_core_check_installed' );
    288288
    289289/**
    … …  
    301301        return false;
    302302
    303     // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
    304     if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
    305         return false;
    306 
    307     // Add the administration tab under the "Site Admin" tab for site administrators
     303    /* Add the administration tab under the "Site Admin" tab for site administrators */
    308304    bp_core_add_admin_menu_page( array(
    309305        'menu_title' => __( 'BuddyPress', 'buddypress' ),
    … …  
    317313    add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
    318314}
    319 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu' );
     315add_action( 'admin_menu', 'bp_core_add_admin_menu' );
    320316
    321317/**

  • tags/1.2.7/bp-core/bp-core-admin.php

    r4072 r4072  
    4444                <?php if ( function_exists( 'xprofile_install' ) ) :?>
    4545                <tr>
    46                     <th scope="row"><p><?php _e( 'Base profile group name', 'buddypress' ) ?>:</p></th>
     46                    <th scope="row"><?php _e( 'Base profile group name', 'buddypress' ) ?>:</th>
    4747                    <td>
    4848                        <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') ?>" />
    … …  
    5050                </tr>
    5151                <tr>
    52                     <th scope="row"><p><?php _e( 'Full Name field name', 'buddypress' ) ?>:</p></th>
     52                    <th scope="row"><?php _e( 'Full Name field name', 'buddypress' ) ?>:</th>
    5353                    <td>
    5454                        <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') ?>" />
    … …  
    5656                </tr>
    5757                <tr>
    58                     <th scope="row"><p><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</p></th>
     58                    <th scope="row"><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</th>
    5959                    <td>
    6060                        <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;
    … …  
    6464                <?php endif; ?>
    6565                <tr>
    66                     <th scope="row"><p><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</p></th>
     66                    <th scope="row"><?php _e( 'Hide admin bar for logged out users?', 'buddypress' ) ?>:</th>
    6767                    <td>
    6868                        <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;
    … …  
    7171                </tr>
    7272                <tr>
    73                     <th scope="row"><p><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</p></th>
     73                    <th scope="row"><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</th>
    7474                    <td>
    7575                        <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;
    … …  
    7878                </tr>
    7979                <tr>
    80                     <th scope="row"><p><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</p></th>
     80                    <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
    8181                    <td>
    8282                        <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;
    … …  
    8686                <?php if ( function_exists( 'bp_forums_setup') ) : ?>
    8787                <tr>
    88                     <th scope="row"><p><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</p></th>
     88                    <th scope="row"><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</th>
    8989                    <td>
    9090                        <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;
    … …  
    9595                <?php if ( function_exists( 'bp_activity_install') ) : ?>
    9696                <tr>
    97                     <th scope="row"><p><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</p></th>
     97                    <th scope="row"><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</th>
    9898                    <td>
    9999                        <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;
    … …  
    104104
    105105                <tr>
    106                     <th scope="row"><p><?php _e( 'Default User Avatar', 'buddypress' ) ?></p></th>
     106                    <th scope="row"><?php _e( 'Default User Avatar', 'buddypress' ) ?></th>
    107107                    <td>
    108108                        <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>

  • tags/1.2.7/bp-core/bp-core-adminbar.php

    r4072 r4072  
    274274}
    275275
    276 /**
    277  * Provides fallback support for the WordPress 3.1 admin bar
    278  *
    279  * By default, this function turns off the WP 3.1 admin bar in favor of the classic BP BuddyBar.
    280  * To turn off the BP BuddyBar in favor of WP's admin bar, place the following in wp-config.php:
    281  * define( 'BP_USE_WP_ADMIN_BAR', true );
    282  *
    283  * @package BuddyPress Core
    284  * @since 1.2.8
    285  */
    286 function bp_core_load_admin_bar() {
    287     global $wp_version;
    288    
    289     if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && version_compare( $wp_version, 3.1, '>=' ) ) {
    290         // TODO: Add BP support to WP admin bar
    291         return;
    292     } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
    293         // Keep the WP admin bar from loading
    294         if ( function_exists( 'show_admin_bar' ) )
    295             show_admin_bar( false );
    296        
    297         // Actions used to build the BP admin bar
    298         add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );
    299         add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu',         2   );
    300         add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu',       4   );
    301         add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu',         6   );
    302         add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu',      6   );
    303         add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8   );
    304         add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu',       12  );
    305         add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu',        100 );
    306        
    307         // Actions used to append BP admin bar to footer
    308         add_action( 'wp_footer',    'bp_core_admin_bar', 8 );
    309         add_action( 'admin_footer', 'bp_core_admin_bar'    );   
    310     }
    311 }
    312 add_action( 'bp_loaded', 'bp_core_load_admin_bar' );
     276// Actions used to build the admin bar
     277add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );
     278add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu',         2   );
     279add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu',       4   );
     280add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu',         6   );
     281add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu',      6   );
     282add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8   );
     283add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu',       12  );
     284add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu',        100 );
     285
     286// Actions used to append admin bar to footer
     287add_action( 'wp_footer',    'bp_core_admin_bar', 8 );
     288add_action( 'admin_footer', 'bp_core_admin_bar'    );
    313289
    314290?>

  • tags/1.2.7/bp-core/bp-core-avatars.php

    r4072 r4072  
    523523
    524524function bp_core_check_avatar_type($file) {
    525     if ( ( !empty( $file['file']['type'] ) && !preg_match('/(jpe?g|gif|png)$/', $file['file']['type'] ) ) || !preg_match( '/(jpe?g|gif|png)$/', $file['file']['name'] ) )
     525    if ( ( strlen($file['file']['type']) && !preg_match('/(jpe?g|gif|png)$/', $file['file']['type'] ) ) && !preg_match( '/(jpe?g|gif|png)$/', $file['file']['name'] ) )
    526526        return false;
    527527
    … …  
    568568    // If multisite, and current blog does not match root blog, make adjustments
    569569    if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
    570         $upload_dir['baseurl'] = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     570        $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
    571571
    572572    return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );

  • tags/1.2.7/bp-core/bp-core-wpabstraction.php

    r4072 r4072  
    113113}
    114114
    115 // Added for WordPress 3.1 support
    116 if ( !function_exists( 'get_dashboard_url' ) ) {
    117 
    118     /**
    119      * Make sure the 'network_admin_menu' hook (which is new to 3.1) fires
    120      * on our reliable friend 'admin_menu'
    121      */
    122     function bp_network_admin_menu() {
    123         do_action( 'network_admin_menu' );
    124     }
    125     add_action( 'admin_menu', 'bp_network_admin_menu' );
    126 }
    127 
    128115?>

  • tags/1.2.7/bp-forums.php

    r4072 r4072  
    103103    add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
    104104}
    105 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_forums_add_admin_menu' );
     105add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
    106106
    107107/* Forum Functions */

  • tags/1.2.7/bp-forums/bp-forums-admin.php

    r4072 r4072  
    1212                <p><?php _e( 'Settings Saved.', 'buddypress' ) ?></p>
    1313            </div>
    14         <?php endif;
     14        <?php endif; ?>
     15
     16        <?php
    1517
    1618        if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) {
    1719            update_site_option( 'bb-config-location', false );
    1820            bp_forums_bbpress_install_wizard();
    19         } else {
    20             $reinstall = network_admin_url( 'admin.php?page=bb-forums-setup&reinstall=1' ); ?>
    21 
    22             <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 ); ?>
     21        } else { ?>
     22            <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' ) ); ?>
    2323            <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>
    24 
    2524        <?php
    2625        }
    … …  
    3130
    3231function bp_forums_bbpress_install_wizard() {
    33     $post_url = network_admin_url( 'admin.php?page=bb-forums-setup' );
     32    $post_url = site_url( 'wp-admin/admin.php?page=bb-forums-setup' );
    3433
    3534    switch( $_REQUEST['step'] ) {
    … …  
    6968                        // Just write the contents to screen
    7069                        _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' );
    71                         ?><br /><textarea cols="110" rows="50" style="margin: 10px 0 50px 0;"><?php echo htmlspecialchars( $result ) ?></textarea><?php
     70                        ?><code style="display:block; margin-top: 30px;"><pre><?php echo htmlspecialchars( $result ) ?></pre></code><?php
    7271                        break;
    7372                }

  • tags/1.2.7/bp-friends.php

    r4072 r4072  
    6262        friends_install();
    6363}
    64 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'friends_check_installed' );
     64add_action( 'admin_menu', 'friends_check_installed' );
    6565
    6666function friends_setup_nav() {

  • tags/1.2.7/bp-groups.php

    r4072 r4072  
    117117        groups_install();
    118118}
    119 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'groups_check_installed' );
     119add_action( 'admin_menu', 'groups_check_installed' );
    120120
    121121function groups_setup_nav() {

  • tags/1.2.7/bp-languages/buddypress.pot

    r4072 r4072  
    55"Project-Id-Version: BuddyPress \n"
    66"Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
    7 "POT-Creation-Date: 2011-02-23 11:30:34+00:00\n"
     7"POT-Creation-Date: 2010-12-20 22:28:00+00:00\n"
    88"MIME-Version: 1.0\n"
    99"Content-Type: text/plain; charset=UTF-8\n"
    … …  
    599599msgstr ""
    600600
    601 #: bp-core/bp-core-templatetags.php:736 bp-core.php:383 bp-xprofile.php:183
     601#: bp-core/bp-core-templatetags.php:736 bp-core.php:379 bp-xprofile.php:183
    602602#: bp-themes/bp-default/activity/post-form.php:41
    603603msgid "My Profile"
    … …  
    668668msgstr ""
    669669
    670 #: bp-core/bp-core-templatetags.php:1032 bp-forums/bp-forums-admin.php:160
     670#: bp-core/bp-core-templatetags.php:1032 bp-forums/bp-forums-admin.php:159
    671671#: bp-themes/bp-default/header.php:68
    672672msgid "Forums"
    … …  
    851851msgstr ""
    852852
    853 #: bp-core/bp-core-settings.php:69 bp-core.php:316
     853#: bp-core/bp-core-settings.php:69 bp-core.php:312
    854854msgid "General Settings"
    855855msgstr ""
    … …  
    912912msgstr ""
    913913
    914 #: bp-core.php:309 bp-core.php:310
     914#: bp-core.php:305 bp-core.php:306
    915915msgid "BuddyPress"
    916916msgstr ""
    917917
    918 #: bp-core.php:317
     918#: bp-core.php:313
    919919msgid "Component Setup"
    920920msgstr ""
    921921
    922 #: bp-core.php:362 bp-xprofile.php:172
     922#: bp-core.php:358 bp-xprofile.php:172
    923923msgid "Profile"
    924924msgstr ""
    925925
    926 #: bp-core.php:373 bp-groups/bp-groups-templatetags.php:419 bp-xprofile.php:177
     926#: bp-core.php:369 bp-groups/bp-groups-templatetags.php:419 bp-xprofile.php:177
    927927msgid "Public"
    928928msgstr ""
    929929
    930 #: bp-core.php:479
     930#: bp-core.php:475
    931931msgid "User marked as spammer. Spam users are visible only to site admins."
    932932msgstr ""
    933933
    934 #: bp-core.php:481
     934#: bp-core.php:477
    935935msgid "User removed as spammer."
    936936msgstr ""
    937937
    938 #: bp-core.php:515
     938#: bp-core.php:511
    939939msgid "%s has been deleted from the system."
    940940msgstr ""
    941941
    942 #: bp-core.php:517
     942#: bp-core.php:513
    943943msgid "There was an error deleting %s from the system. Please try again."
    944944msgstr ""
    945945
     946#: bp-core.php:1416
     947msgid "year"
     948msgstr ""
     949
     950#: bp-core.php:1416
     951msgid "years"
     952msgstr ""
     953
     954#: bp-core.php:1417
     955msgid "month"
     956msgstr ""
     957
     958#: bp-core.php:1417
     959msgid "months"
     960msgstr ""
     961
     962#: bp-core.php:1418
     963msgid "week"
     964msgstr ""
     965
     966#: bp-core.php:1418
     967msgid "weeks"
     968msgstr ""
     969
     970#: bp-core.php:1419
     971msgid "day"
     972msgstr ""
     973
     974#: bp-core.php:1419
     975msgid "days"
     976msgstr ""
     977
    946978#: bp-core.php:1420
    947 msgid "year"
     979msgid "hour"
    948980msgstr ""
    949981
    950982#: bp-core.php:1420
    951 msgid "years"
     983msgid "hours"
    952984msgstr ""
    953985
    954986#: bp-core.php:1421
    955 msgid "month"
     987msgid "minute"
    956988msgstr ""
    957989
    958990#: bp-core.php:1421
    959 msgid "months"
     991msgid "minutes"
    960992msgstr ""
    961993
    962994#: bp-core.php:1422
    963 msgid "week"
    964 msgstr ""
    965 
    966 #: bp-core.php:1422
    967 msgid "weeks"
    968 msgstr ""
    969 
    970 #: bp-core.php:1423
    971 msgid "day"
    972 msgstr ""
    973 
    974 #: bp-core.php:1423
    975 msgid "days"
    976 msgstr ""
    977 
    978 #: bp-core.php:1424
    979 msgid "hour"
    980 msgstr ""
    981 
    982 #: bp-core.php:1424
    983 msgid "hours"
    984 msgstr ""
    985 
    986 #: bp-core.php:1425
    987 msgid "minute"
    988 msgstr ""
    989 
    990 #: bp-core.php:1425
    991 msgid "minutes"
    992 msgstr ""
    993 
    994 #: bp-core.php:1426
    995995msgid "second"
    996996msgstr ""
    997997
    998 #: bp-core.php:1426 bp-core.php:1478
     998#: bp-core.php:1422 bp-core.php:1474
    999999msgid "seconds"
    10001000msgstr ""
    10011001
    1002 #: bp-core.php:1445
     1002#: bp-core.php:1441
    10031003msgid "sometime"
    10041004msgstr ""
    10051005
    1006 #: bp-core.php:1473
     1006#: bp-core.php:1469
    10071007msgctxt "Separator in time since"
    10081008msgid ","
    10091009msgstr ""
    10101010
    1011 #: bp-core.php:1528
     1011#: bp-core.php:1524
    10121012msgid "not recently active"
    10131013msgstr ""
    10141014
    1015 #: bp-core.php:2038
     1015#: bp-core.php:2034
    10161016msgid "IMPORTANT: <a href=\"http://codex.buddypress.org/getting-started/upgrading-from-10x/\">Read this before attempting to update BuddyPress</a>"
    10171017msgstr ""
    10181018
    1019 #: bp-core.php:2067
     1019#: bp-core.php:2063
    10201020msgid "<strong>BuddyPress is almost ready</strong>. You must <a href=\"%s\">update your permalink structure</a> to something other than the default for it to work."
    10211021msgstr ""
    10221022
    1023 #: bp-core.php:2076
     1023#: bp-core.php:2072
    10241024msgid "<strong>BuddyPress is ready</strong>. You'll need to <a href='%s'>activate a BuddyPress compatible theme</a> to take advantage of all of the features. We've bundled a default theme, but you can always <a href='%s'>install some other compatible themes</a> or <a href='%s'>upgrade your existing WordPress theme</a>."
    10251025msgstr ""
    … …  
    19271927msgstr ""
    19281928
    1929 #: bp-forums/bp-forums-admin.php:39
     1929#: bp-forums/bp-forums-admin.php:38
    19301930msgid "The bb-config.php file was not found at that location, please try again."
    19311931msgstr ""
    19321932
     1933#: bp-forums/bp-forums-admin.php:41
     1934msgid "Forums were set up correctly using your existing bbPress install!"
     1935msgstr ""
     1936
    19331937#: bp-forums/bp-forums-admin.php:42
    1934 msgid "Forums were set up correctly using your existing bbPress install!"
    1935 msgstr ""
    1936 
    1937 #: bp-forums/bp-forums-admin.php:43
    19381938msgid "BuddyPress will now use its internal copy of bbPress to run the forums on your site. If you wish, you can remove your old bbPress installation files, as long as you keep the bb-config.php file in the same location."
    19391939msgstr ""
    19401940
     1941#: bp-forums/bp-forums-admin.php:47
     1942msgid "Existing bbPress Installation"
     1943msgstr ""
     1944
    19411945#: bp-forums/bp-forums-admin.php:48
    1942 msgid "Existing bbPress Installation"
    1943 msgstr ""
    1944 
    1945 #: bp-forums/bp-forums-admin.php:49
    19461946msgid "BuddyPress can make use of your existing bbPress install. Just provide the location of your <code>bb-config.php</code> file, and BuddyPress will do the rest."
    19471947msgstr ""
    19481948
    1949 #: bp-forums/bp-forums-admin.php:51 bp-forums/bp-forums-admin.php:79
     1949#: bp-forums/bp-forums-admin.php:50 bp-forums/bp-forums-admin.php:78
    19501950msgid "Complete Installation"
    19511951msgstr ""
    19521952
    1953 #: bp-forums/bp-forums-admin.php:66
     1953#: bp-forums/bp-forums-admin.php:65
    19541954msgid "All done! Configuration settings have been saved to the file <code>bb-config.php</code> in the root of your WordPress install."
    19551955msgstr ""
    … …  
    19571957#. Just write the contents to screen
    19581958
    1959 #: bp-forums/bp-forums-admin.php:70
     1959#: bp-forums/bp-forums-admin.php:69
    19601960msgid "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."
    19611961msgstr ""
    19621962
     1963#: bp-forums/bp-forums-admin.php:75
     1964msgid "New bbPress Installation"
     1965msgstr ""
     1966
    19631967#: bp-forums/bp-forums-admin.php:76
    1964 msgid "New bbPress Installation"
    1965 msgstr ""
    1966 
    1967 #: bp-forums/bp-forums-admin.php:77
    19681968msgid ""
    19691969"You've decided to set up a new installation of bbPress for forum management in BuddyPress. This is very simple and is usually just a one click\n"
    … …  
    19711971msgstr ""
    19721972
    1973 #: bp-forums/bp-forums-admin.php:87
     1973#: bp-forums/bp-forums-admin.php:86
    19741974msgid "bbPress files were not found. To install the forums component you must download a copy of bbPress and make sure it is in the folder: \"%s\""
    19751975msgstr ""
    19761976
    1977 #: bp-forums/bp-forums-admin.php:91
     1977#: bp-forums/bp-forums-admin.php:90
    19781978msgid "Forums in BuddyPress make use of a bbPress installation to function. You can choose to either let BuddyPress set up a new bbPress install, or use an already existing bbPress install. Please choose one of the options below."
    19791979msgstr ""
    19801980
     1981#: bp-forums/bp-forums-admin.php:92
     1982msgid "Set up a new bbPress installation"
     1983msgstr ""
     1984
    19811985#: bp-forums/bp-forums-admin.php:93
    1982 msgid "Set up a new bbPress installation"
    1983 msgstr ""
    1984 
    1985 #: bp-forums/bp-forums-admin.php:94
    19861986msgid "Use an existing bbPress installation"
    19871987msgstr ""

  • tags/1.2.7/bp-loader.php

    r4072 r4072  
    55Description: 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.
    66Author: The BuddyPress Community
    7 Version: 1.2.8
     7Version: 1.2.7
    88Author URI: http://buddypress.org/community/members/
     9Site Wide Only: true
    910Network: true
    1011*/
    1112
    12 define( 'BP_VERSION', '1.2.8' );
     13define( 'BP_VERSION', '1.2.7' );
    1314
    1415/***

  • tags/1.2.7/bp-messages.php

    r4072 r4072  
    9797        messages_install();
    9898}
    99 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'messages_check_installed' );
     99add_action( 'admin_menu', 'messages_check_installed' );
    100100
    101101function messages_setup_nav() {

  • tags/1.2.7/bp-xprofile.php

    r4072 r4072  
    152152        xprofile_install();
    153153}
    154 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
     154add_action( 'admin_menu', 'xprofile_add_admin_menu' );
    155155
    156156/**

  • tags/1.2.7/bp-xprofile/bp-xprofile-cssjs.php

    r4072 r4072  
    22
    33function xprofile_add_admin_css() {
    4     // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
    5     if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
    6         return false;
    7 
    8     if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false )
    9         wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
     4    wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
    105}
    11 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_css' );
     6add_action( 'admin_menu', 'xprofile_add_admin_css' );
    127
    138function xprofile_add_admin_js() {
    14     // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
    15     if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
    16         return false;
    17 
    18     if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
     9    if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
    1910        wp_enqueue_script( array( "jquery-ui-sortable" ) );
    2011        wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery' ) );
    2112    }
    2213}
    23 add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_js', 1 );
     14add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
    2415
    2516?>

  • tags/1.2.7/license.txt

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

  • tags/1.2.7/readme.txt

    r4072 r4072  
    22Contributors: apeatling, johnjamesjacoby, MrMaz, DJPaul, boonebgorges
    33Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
    4 Requires at least: 3.1
    5 Tested up to: 3.1
    6 Stable tag: 1.2.8
     4Requires at least: 3.0
     5Tested up to: 3.0.3
     6Stable tag: 1.2.7
    77
    88== Description ==
    … …  
    6262Of 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.
    6363
    64 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>.
     64Be 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>.
    6565
    6666= Will this work on standard WordPress and WordPress MU? =
    … …  
    9696== Languages ==
    9797
    98 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.
     98BuddyPress 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.
    9999
    100100*   <a href="http://br.buddypress.org/">Brasil</a>
    … …  
    118118*   <a href="http://tw.buddypress.org/">正體中文</a>
    119119
    120 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.
     120The <a href="http://i18n.svn.buddypress.org/">BuddyPress langauge file repository</a> includes some language that have not yet set up a localization site.
    121121
    122122== Upgrade Notice ==
    123123
    124 = 1.2.8 =
    125 Compatibility with WordPress 3.1
     124= 1.2.7 =
     125Fixes over 10 bugs.
    126126
    127127== Changelog ==
Note: See TracChangeset for help on using the changeset viewer.