<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [1753] trunk/bp-forums/bp-forums-admin.php: Fixes #937, #938</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1753</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-01 18:40:47 +0000 (Tue, 01 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #937, #938</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsadminphp">trunk/bp-forums/bp-forums-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (1752 => 1753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2009-09-01 14:11:08 UTC (rev 1752)
+++ trunk/bp-forums/bp-forums-admin.php 2009-09-01 18:40:47 UTC (rev 1753)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- if ( isset( $_REQUEST['reinstall']) || !bp_forums_is_installed_correctly() )
</del><ins>+ if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() )
</ins><span class="cx"> bp_forums_bbpress_install_wizard();
</span><span class="cx"> else { ?>
</span><span class="cx"> <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' ) ); ?>
</span><span class="lines">@@ -30,11 +30,16 @@
</span><span class="cx"> $post_url = site_url( 'wp-admin/admin.php?page=' . 'buddypress/bp-forums.php' );
</span><span class="cx">
</span><span class="cx"> switch( $_REQUEST['step'] ) {
</span><del>- case 'existing':
</del><ins>+ case 'existing':
</ins><span class="cx"> if ( 1 == (int)$_REQUEST['doinstall'] ) {
</span><del>- if ( !bp_forums_configure_existing_install() )
</del><ins>+ if ( !bp_forums_configure_existing_install() ) {
</ins><span class="cx"> _e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' );
</span><del>- }
</del><ins>+ } else {
+ ?>
+ <h3><?php _e( 'Forums were set up correctly using your existing bbPress install!') ?></h3>
+ <p><?php _e( 'BuddyPress will now use its internal copy of bbPress to run the forums on your site. If you wish, you can remove your old bbPress installation files, as long as you keep the bb-config.php file in the same location.' ) ?></p><?php
+ }
+ } else {
</ins><span class="cx"> ?>
</span><span class="cx"> <form action="" method="post">
</span><span class="cx"> <h3><?php _e( 'Existing bbPress Installation', 'buddypress' ) ?></h3>
</span><span class="lines">@@ -46,8 +51,9 @@
</span><span class="cx"> <?php wp_nonce_field( 'bp_forums_existing_install_init' ) ?>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span><ins>+ }
</ins><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'new':
</span><span class="cx"> if ( 1 == (int)$_REQUEST['doinstall'] ) {
</span><span class="cx"> $result = bp_forums_bbpress_install();
</span><span class="lines">@@ -88,6 +94,9 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'bp_forums_existing_install_init' );
</span><span class="cx">
</span><ins>+ /* Sanitize $_REQUEST['bbconfigloc'] */
+ $_REQUEST['bbconfigloc'] = apply_filters( 'bp_forums_bbconfig_location', $_REQUEST['bbconfigloc'] );
+
</ins><span class="cx"> if ( false === strpos( $_REQUEST['bbconfigloc'], 'bb-config.php' ) ) {
</span><span class="cx"> if ( '/' != substr( $_REQUEST['bbconfigloc'], -1, 1 ) )
</span><span class="cx"> $_REQUEST['bbconfigloc'] .= '/';
</span></span></pre>
</div>
</div>
</body>
</html>