Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
06/18/2012 01:06:13 PM (12 years ago)
Author:
boonebgorges
Message:

Reinstates 1.5.x integration of bbPress 1.x forum installation and configuration

In anticipation for a full switchover to bbPress 2.x in BuddyPress 1.6, several
aspects of the forum configuration and setup process were modified. Since
the migration to bbPress 2.x is being put off to a later version of BuddyPress,
it's necessary to revert some of these changes back to their BP 1.5.x state.

This changeset also fixes a bug in the bb-config.php creation script, where
a salt containing the string '?>' could result in early termination of the
config file.

Fixes #4269

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/groups/create.php

    r5888 r6108  
    108108                    </div>
    109109
    110                     <?php if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) : ?>
     110                    <?php if ( bp_is_active( 'forums' ) ) : ?>
    111111
    112112                        <h4><?php _e( 'Group Forums', 'buddypress' ); ?></h4>
    113113
    114                         <p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
    115 
    116                         <div class="checkbox">
    117                             <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
    118                         </div>
     114                        <?php if ( bp_forums_is_installed_correctly() ) : ?>
     115
     116                            <p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
     117
     118                            <div class="checkbox">
     119                                <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
     120                            </div>
     121                        <?php elseif ( is_super_admin() ) : ?>
     122
     123                            <p><?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_core_do_network_admin() ? network_admin_url( 'settings.php?page=bb-forums-setup' ) :  admin_url( 'admin.php?page=bb-forums-setup' ) ); ?></p>
     124
     125                        <?php endif; ?>
    119126
    120127                    <?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.