Changeset 6195

Timestamp:

07/23/2012 07:43:55 PM (12 years ago)

Author:

djpaul

Message:

In BP's forums settings screen, prevent the "configure site wide forums" link opening in a thickbox iframe if bbPress is already active; instead, just link directly to bbPress' settings screen.

Fixes #4366

File:

• trunk/bp-forums/bp-forums-admin.php (modified) (3 diffs)

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

@@ -110 +110 @@
 
 function bp_forums_bbpress_install_wizard() {
-    $post_url = network_admin_url( 'admin.php?page=bb-forums-setup' );
+    $post_url                 = network_admin_url( 'admin.php?page=bb-forums-setup' );
+    $bbpress_plugin_is_active = false;
 
     $step = isset( $_REQUEST['step'] ) ? $_REQUEST['step'] : '';
@@ -117 +118 @@
     // is running
     if ( is_plugin_active( 'bbpress/bbpress.php' ) ) {
+        $bbpress_plugin_is_active = true;
+
         // The bbPress admin page will always be on the root blog. switch_to_blog() will
         // pass through if we're already there.
@@ -232 +235 @@
                     </ul>
                     <div>
-                        <a class="button thickbox button-primary" href="<?php echo esc_attr( $button_url ) ?>"><?php echo esc_html( $button_text ) ?></a> &nbsp;
+                        <a class="button button-primary <?php if ( ! $bbpress_plugin_is_active ) { echo esc_attr( 'thickbox' ); }?>" href="<?php echo esc_attr( $button_url ) ?>"><?php echo esc_html( $button_text ) ?></a> &nbsp;
                     </div>
                 </div>