Changeset 1861

Timestamp:

09/12/2009 12:30:43 AM (16 years ago)

Author:

apeatling

Message:

Added option to turn off forum directory if your bbPress tables sit in a different database (meaning the directory won't work anyway)

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-admin.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-forums/bp-forums-admin.php (modified) (1 diff)

trunk/bp-core.php

@@ -1479 +1479 @@
 
     /* Make sure account deletion is not disabled */
-    if ( ( 1 == (int)get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
+    if ( ( !(int) get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
         return false;
 

trunk/bp-core/bp-core-admin.php

@@ -92 +92 @@
                         <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( !(int)get_site_option( 'bp-disable-account-deletion' ) || '' == get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>           
+                </tr>
+                <?php if ( function_exists( 'bp_forums_setup') ) : ?>
+                <tr>
+                    <th scope="row"><?php _e( 'Disable global forum directory?', 'buddypress' ) ?>:</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;
+                        <input type="radio" name="bp-admin[bp-disable-forum-directory]"<?php if ( !(int)get_site_option( 'bp-disable-forum-directory' ) || '' == get_site_option( 'bp-disable-forum-directory' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-forum-directory" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
+                    </td>           
                 </tr>               
-                <?php if ( !locate_template( array( 'registration/register.php' ) ) ) :?>
+                <?php endif; ?>
+                            
+                <?php if ( !locate_template( array( 'registration/register.php' ) ) ) : ?>
                 <tr>
                     <th scope="row"><?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?>:</th>

trunk/bp-core/bp-core-settings.php

@@ -22 +22 @@
     bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     
-    if ( !is_site_admin() && 1 != (int)get_site_option( 'bp-disable-account-deletion' ) )
+    if ( !is_site_admin() && !(int) get_site_option( 'bp-disable-account-deletion' ) )
         bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_home() ) );
 }

trunk/bp-forums/bp-forums-admin.php

@@ -20 +20 @@
         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=buddypress/bp-forums.php&reinstall=1' ) ); ?>
+            <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   
         }