Changeset 13232

Timestamp:

02/14/2022 10:43:00 PM (4 years ago)

Author:

johnjamesjacoby

Message:

Loader: avoid conflict with any $subdir globals.

This change renames $subdir to $bp_subdir in bp-loader.php, and also unsets it at the bottom of the file.

No ticket.

File:

• trunk/bp-loader.php (modified) (2 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';
+    $bp_subdir = 'src';
 } else {
-    $subdir = 'build';
+    $bp_subdir = 'build';
 }
 
 // Set source subdirectory
-define( 'BP_SOURCE_SUBDIRECTORY', $subdir );
+define( 'BP_SOURCE_SUBDIRECTORY', $bp_subdir );
 
 // Define overrides - only applicable to those running trunk
@@ -51 +51 @@
 include( $bp_loader );
 
-// Unset the loader, since it's loaded in global scope
-unset( $bp_loader );
+// Unset vars that were invoked in global scope
+unset( $bp_loader, $bp_subdir );