<!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][8740] trunk: Streamline internal path and plugin directory properties.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://buddypress.trac.wordpress.org/changeset/8740">8740</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-07-30 20:40:27 +0000 (Wed, 30 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline internal path and plugin directory properties.
Due to the introduction of Grunt (<a href="http://buddypress.trac.wordpress.org/ticket/5160">#5160</a>), a few issues have popped up with
BP's internal properties (file, basename, plugin_dir, and plugin_url) being
incorrect for those running trunk.
To address this:
In the stub `bp-loader.php` file:
- We introduce a new constant - `BP_SOURCE_DIRECTORY` - to determine what source folder is being run from trunk.
- `BP_PLUGIN_DIR` and `BP_PLUGIN_URL` are defined so these constants take precedence over the ones in the main bp-loader.php file.
- `BP_PLUGIN_URL` uses a slightly different algorithm to be nice to symlinked directories as `plugin_dir_url()` does not work properly in these instances.
In the main `bp-loader.php file:
- `BP_SOURCE_DIRECTORY` is set to a blank string.
- The `file` and `basename` are calculated based off the `BP_PLUGIN_DIR` constant
- `plugin_dir` and `plugin_url` are set to whatever build is running
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5652">#5652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
<li><a href="#trunksrcbploaderphp">trunk/src/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 (8739 => 8740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2014-07-30 20:19:13 UTC (rev 8739)
+++ trunk/bp-loader.php 2014-07-30 20:40:27 UTC (rev 8740)
</span><span class="lines">@@ -30,8 +30,23 @@
</span><span class="cx"> // Load from source if no build exists
</span><span class="cx"> if ( ! file_exists( $bp_loader ) || defined( 'BP_LOAD_SOURCE' ) ) {
</span><span class="cx"> $bp_loader = dirname( __FILE__ ) . '/src/bp-loader.php';
</span><ins>+ $subdir = 'src';
+} else {
+ $subdir = 'build';
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// Set source subdirectory
+define( 'BP_SOURCE_SUBDIRECTORY', $subdir );
+
+// Define overrides - only applicable to those running trunk
+if ( ! defined( 'BP_PLUGIN_DIR' ) ) {
+ define( 'BP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+}
+if ( ! defined( 'BP_PLUGIN_URL' ) ) {
+ // Be nice to symlinked directories
+ define( 'BP_PLUGIN_URL', plugins_url( trailingslashit( basename( constant( 'BP_PLUGIN_DIR' ) ) ) ) );
+}
+
</ins><span class="cx"> // Include BuddyPress
</span><span class="cx"> include( $bp_loader );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-loader.php (8739 => 8740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-loader.php 2014-07-30 20:19:13 UTC (rev 8739)
+++ trunk/src/bp-loader.php 2014-07-30 20:40:27 UTC (rev 8740)
</span><span class="lines">@@ -227,17 +227,16 @@
</span><span class="cx">
</span><span class="cx"> // Path and URL
</span><span class="cx"> if ( ! defined( 'BP_PLUGIN_DIR' ) ) {
</span><del>- define( 'BP_PLUGIN_DIR', trailingslashit( plugin_dir_path( __FILE__ ) ) );
</del><ins>+ define( 'BP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! defined( 'BP_PLUGIN_URL' ) ) {
</span><del>- $plugin_url = plugin_dir_url( __FILE__ );
</del><ins>+ define( 'BP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+ }
</ins><span class="cx">
</span><del>- // If we're using https, update the protocol. Workaround for WP13941, WP15928, WP19037.
- if ( is_ssl() )
- $plugin_url = str_replace( 'http://', 'https://', $plugin_url );
-
- define( 'BP_PLUGIN_URL', $plugin_url );
</del><ins>+ // Only applicable to those running trunk
+ if ( ! defined( 'BP_SOURCE_SUBDIRECTORY' ) ) {
+ define( 'BP_SOURCE_SUBDIRECTORY', '' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Define on which blog ID BuddyPress should run
</span><span class="lines">@@ -260,7 +259,7 @@
</span><span class="cx"> $plugins = get_site_option( 'active_sitewide_plugins');
</span><span class="cx">
</span><span class="cx"> // basename
</span><del>- $basename = str_replace( array( 'build/', 'src/' ), '', plugin_basename( constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php' ) );
</del><ins>+ $basename = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
</ins><span class="cx">
</span><span class="cx"> // plugin is network-activated; use main site ID instead
</span><span class="cx"> if ( isset( $plugins[ $basename ] ) ) {
</span><span class="lines">@@ -358,10 +357,10 @@
</span><span class="cx"> /** Paths**************************************************************/
</span><span class="cx">
</span><span class="cx"> // BuddyPress root directory
</span><del>- $this->file = __FILE__;
- $this->basename = str_replace( array( 'build/', 'src/' ), '', plugin_basename( $this->file ) );
- $this->plugin_dir = BP_PLUGIN_DIR;
- $this->plugin_url = BP_PLUGIN_URL;
</del><ins>+ $this->file = constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php';
+ $this->basename = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
+ $this->plugin_dir = trailingslashit( constant( 'BP_PLUGIN_DIR' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
+ $this->plugin_url = trailingslashit( constant( 'BP_PLUGIN_URL' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
</ins><span class="cx">
</span><span class="cx"> // Languages
</span><span class="cx"> $this->lang_dir = $this->plugin_dir . 'bp-languages';
</span></span></pre>
</div>
</div>
</body>
</html>