<!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" />
<title>[BuddyPress][3946] trunk/bp-loader.php: Prevent bp-loader.php from throwing notices if it is included more than once.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3946</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-27 06:37:49 +0000 (Thu, 27 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent bp-loader.php from throwing notices if it is included more than once.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (3945 => 3946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2011-01-27 06:30:26 UTC (rev 3945)
+++ trunk/bp-loader.php 2011-01-27 06:37:49 UTC (rev 3946)
</span><span class="lines">@@ -10,24 +10,32 @@
</span><span class="cx"> */
</span><span class="cx"> /** Constants *****************************************************************/
</span><span class="cx">
</span><del>-define( 'BP_VERSION', '1.3-bleeding' );
-define( 'BP_DB_VERSION', 3605 );
</del><ins>+// Define the BuddyPress version
+if ( !defined( 'BP_VERSION' ) )
+ define( 'BP_VERSION', '1.3-bleeding' );
</ins><span class="cx">
</span><ins>+// Define the database version
+if ( !defined( 'BP_DB_VERSION' ) )
+ define( 'BP_DB_VERSION', 3605 );
+
</ins><span class="cx"> // Define on which blog ID BuddyPress should run
</span><span class="cx"> if ( !defined( 'BP_ROOT_BLOG' ) )
</span><span class="cx"> define( 'BP_ROOT_BLOG', 1 );
</span><span class="cx">
</span><span class="cx"> // Path and URL
</span><del>-define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
-define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
</del><ins>+if ( !defined( 'BP_PLUGIN_DIR' ) )
+ define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
</ins><span class="cx">
</span><ins>+if ( !defined( 'BP_PLUGIN_URL' ) )
+ define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
+
</ins><span class="cx"> // Load the WP abstraction file so BuddyPress can run on all WordPress setups.
</span><del>-require ( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
</del><ins>+require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
</ins><span class="cx">
</span><span class="cx"> // Place your custom code (actions/filters) in a file called
</span><span class="cx"> // '/plugins/bp-custom.php' and it will be loaded before anything else.
</span><span class="cx"> if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
</span><del>- require( WP_PLUGIN_DIR . '/bp-custom.php' );
</del><ins>+ require_once( WP_PLUGIN_DIR . '/bp-custom.php' );
</ins><span class="cx">
</span><span class="cx"> // Define the user and usermeta table names, useful if you are using custom or shared tables.
</span><span class="cx"> if ( !defined( 'CUSTOM_USER_TABLE' ) )
</span><span class="lines">@@ -44,7 +52,8 @@
</span><span class="cx">
</span><span class="cx"> require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-bootstrap.php' );
</span><span class="cx">
</span><del>-/**
</del><ins>+if ( !function_exists( 'bp_loader_activate' ) ) :
+/**
</ins><span class="cx"> * Defines BP's activation routine.
</span><span class="cx"> *
</span><span class="cx"> * Most of BP's crucial setup is handled by the setup wizard. This function takes care of some
</span><span class="lines">@@ -68,11 +77,14 @@
</span><span class="cx"> do_action( 'bp_loader_activate' );
</span><span class="cx"> }
</span><span class="cx"> register_activation_hook( 'buddypress/bp-loader.php', 'bp_loader_activate' );
</span><ins>+endif;
</ins><span class="cx">
</span><ins>+if ( !function_exists( 'bp_loader_deactivate' ) ) :
</ins><span class="cx"> // Deactivation Function
</span><span class="cx"> function bp_loader_deactivate() {
</span><span class="cx"> do_action( 'bp_loader_deactivate' );
</span><span class="cx"> }
</span><span class="cx"> register_deactivation_hook( 'buddypress/bp-loader.php', 'bp_loader_deactivate' );
</span><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>