Skip to:
Content

BuddyPress.org


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/bp-forums/bp-forums-admin.php

    r4068 r3186  
    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                }
Note: See TracChangeset for help on using the changeset viewer.