Changeset 8740

Timestamp:

07/30/2014 08:40:27 PM (10 years ago)

Author:

r-a-y

Message:

Streamline internal path and plugin directory properties.

Due to the introduction of Grunt (#5160), 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 #5652.

Location:

trunk

Files:

• bp-loader.php (modified) (1 diff)
• src/bp-loader.php (modified) (3 diffs)

trunk/bp-loader.php

@@ -31 +31 @@
 if ( ! file_exists( $bp_loader ) || defined( 'BP_LOAD_SOURCE' ) ) {
     $bp_loader = dirname( __FILE__ ) . '/src/bp-loader.php';
+    $subdir = 'src';
+} else {
+    $subdir = 'build';
+}
+
+// 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' ) ) ) ) );
 }
 

trunk/src/bp-loader.php

@@ -228 +228 @@
         // Path and URL
         if ( ! defined( 'BP_PLUGIN_DIR' ) ) {
-            define( 'BP_PLUGIN_DIR', trailingslashit( plugin_dir_path( __FILE__ ) ) );
+            define( 'BP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
         }
 
         if ( ! defined( 'BP_PLUGIN_URL' ) ) {
-            $plugin_url = plugin_dir_url( __FILE__ );
-
-            // 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 );
+            define( 'BP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+        }
+
+        // Only applicable to those running trunk
+        if ( ! defined( 'BP_SOURCE_SUBDIRECTORY' ) ) {
+            define( 'BP_SOURCE_SUBDIRECTORY', '' );
         }
 
@@ -261 +260 @@
 
                     // basename
-                    $basename = str_replace( array( 'build/', 'src/' ), '', plugin_basename( constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php' ) );
+                    $basename = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
 
                     // plugin is network-activated; use main site ID instead
@@ -359 +358 @@
 
         // BuddyPress root directory
-        $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;
+        $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' ) );
 
         // Languages