Ticket #9210: proposed-new-9210.01.patch

src/bp-core/bp-core-functions.php

@@ -4975 +4975 @@
                 return $deprecated_functions_versions;
         }
 
+        // Allow development version of BuddyPress to load deprecated functions the same as production version.
+        $bypass = (bool) apply_filters( 'bypass_bp_source_subdirectory_check', false );
+
         /*
          * Unless the `BP_IGNORE_DEPRECATED` constant is used & set to false, the development
-         * version of BuddyPress do not load deprecated functions.
+         * version of BuddyPress do not load deprecated functions, except when 'bypass_bp_source_subdirectory_check'
+         * is true.
          */
-        if ( defined( 'BP_SOURCE_SUBDIRECTORY' ) && BP_SOURCE_SUBDIRECTORY === 'src' ) {
+        if ( defined( 'BP_SOURCE_SUBDIRECTORY' ) && BP_SOURCE_SUBDIRECTORY === 'src' && ! $bypass ) {
                 return array();
         }
 
@@ -5011 +5015 @@
                         }
                 }
 
-                // Load 12.0 deprecated functions only when BP was installed with 12.0 or 14.0.
-                if ( in_array( $initial_version, array( 12.0, 14.0 ) ) ) {
+                // Load 12.0 deprecated functions only when BP was installed with 12.0, 14.0 or 15.0.
+                if ( in_array( $initial_version, array( 12.0, 14.0, 15.0 ) ) ) {
                         return array( 12.0 );
                 }
 
                 return array();
         }
 
-        $index_first_major = array_search( $initial_version, $deprecated_functions_versions, true );
-        if ( false === $index_first_major ) {
-                return array_splice( $deprecated_functions_versions, -2 );
-        }
-
-        $latest_deprecated_functions_versions = array_splice( $deprecated_functions_versions, $index_first_major );
-
-        if ( 2 <= count( $latest_deprecated_functions_versions ) ) {
-                $latest_deprecated_functions_versions = array_splice( $latest_deprecated_functions_versions, -2 );
-        }
-
-        $index_initial_version = array_search( $initial_version, $latest_deprecated_functions_versions, true );
-        if ( false !== $index_initial_version ) {
-                unset( $latest_deprecated_functions_versions[ $index_initial_version ] );
-        }
-
-        if ( $initial_version < 15.0 ) {
-                $latest_deprecated_functions_versions = array_merge( array( 12.0 ), $latest_deprecated_functions_versions );
+        if ( (float) 15 >= $current_major_version ) {
+                $keep_last = count( $deprecated_functions_versions ) - array_search( 12.0, $deprecated_functions_versions, true );
+        } else {
+                $keep_last = 2;
         }
 
-        return $latest_deprecated_functions_versions;
+        // Only load deprecated functions determined by $keep_last.
+        return array_splice( $deprecated_functions_versions, -$keep_last );
 }
 
 /**