<!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] [2665] trunk/bp-forums/bp-forums-admin.php: Fixes #1797,
fixes #1825</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2665</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-11 11:54:44 +0000 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1797, fixes #1825</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 (2664 => 2665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2010-02-11 11:34:52 UTC (rev 2664)
+++ trunk/bp-forums/bp-forums-admin.php 2010-02-11 11:54:44 UTC (rev 2665)
</span><span class="lines">@@ -136,10 +136,10 @@
</span><span class="cx"> "define( 'BBDB_HOST'," => array( "'localhost'", "'" . DB_HOST . "'" ),
</span><span class="cx"> "define( 'BBDB_CHARSE" => array( "'utf8'", "'" . DB_CHARSET . "'" ),
</span><span class="cx"> "define( 'BBDB_COLLAT" => array( "''", "'" . DB_COLLATE . "'" ),
</span><del>- "define( 'BB_AUTH_KEY" => array( "'put your unique phrase here'", "'" . AUTH_KEY . "'" ),
- "define( 'BB_SECURE_A" => array( "'put your unique phrase here'", "'" . SECURE_AUTH_KEY . "'" ),
- "define( 'BB_LOGGED_I" => array( "'put your unique phrase here'", "'" . LOGGED_IN_KEY . "'" ),
- "define( 'BB_NONCE_KE" => array( "'put your unique phrase here'", "'" . NONCE_KEY . "'" ),
</del><ins>+ "define( 'BB_AUTH_KEY" => array( "'put your unique phrase here'", "'" . addslashes( AUTH_KEY ) . "'" ),
+ "define( 'BB_SECURE_A" => array( "'put your unique phrase here'", "'" . addslashes( SECURE_AUTH_KEY ) . "'" ),
+ "define( 'BB_LOGGED_I" => array( "'put your unique phrase here'", "'" . addslashes( LOGGED_IN_KEY ) . "'" ),
+ "define( 'BB_NONCE_KE" => array( "'put your unique phrase here'", "'" . addslashes( NONCE_KEY ) . "'" ),
</ins><span class="cx"> "\$bb_table_prefix = '" => array( "'bb_'", "'" . $wpdb->base_prefix . "bb_'" ),
</span><span class="cx"> "define( 'BB_LANG', '" => array( "''", "'" . WPLANG . "'" )
</span><span class="cx"> )
</span><span class="lines">@@ -162,13 +162,13 @@
</span><span class="cx"> $file .= "\n" . '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
</span><span class="cx">
</span><span class="cx"> if ( defined( 'AUTH_SALT' ) )
</span><del>- $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");';
</del><ins>+ $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . addslashes( AUTH_SALT ) . '");';
</ins><span class="cx">
</span><span class="cx"> if ( defined( 'LOGGED_IN_SALT' ) )
</span><del>- $file .= "\n" . 'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';
</del><ins>+ $file .= "\n" . 'define(\'BB_LOGGED_IN_SALT\', "' . addslashes( LOGGED_IN_SALT ) . '");';
</ins><span class="cx">
</span><span class="cx"> if ( defined( 'SECURE_AUTH_SALT' ) )
</span><del>- $file .= "\n" . 'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';
</del><ins>+ $file .= "\n" . 'define(\'BB_SECURE_AUTH_SALT\', "' . addslashes( SECURE_AUTH_SALT ) . '");';
</ins><span class="cx">
</span><span class="cx"> $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';
</span><span class="cx"> $file .= "\n\n" . '?>';
</span></span></pre>
</div>
</div>
</body>
</html>