Changeset 6108 for trunk/bp-themes/bp-default/groups/create.php

Timestamp:

06/18/2012 01:06:13 PM (13 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:

• trunk/bp-themes/bp-default/groups/create.php (modified) (1 diff)

trunk/bp-themes/bp-default/groups/create.php

@@ -108 +108 @@
                     </div>
 
-                    <?php if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) : ?>
+                    <?php if ( bp_is_active( 'forums' ) ) : ?>
 
                         <h4><?php _e( 'Group Forums', 'buddypress' ); ?></h4>
 
-                        <p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
-
-                        <div class="checkbox">
-                            <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>
-                        </div>
+                        <?php if ( bp_forums_is_installed_correctly() ) : ?>
+
+                            <p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
+
+                            <div class="checkbox">
+                                <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>
+                            </div>
+                        <?php elseif ( is_super_admin() ) : ?>
+
+                            <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>
+
+                        <?php endif; ?>
 
                     <?php endif; ?>