Changeset 13705 for trunk/src/bp-core/bp-core-functions.php

Timestamp:

01/22/2024 03:50:51 AM (16 months ago)

Author:

imath

Message:

Use the current major version to decide about deprecated code to load

Using the current version in case of a minor version was preventing deprecated code to be loaded when this minor version was used to first activate BuddyPress.

Props vapvarun, emaralive

See #9075 (trunk)
Closes ​https://github.com/buddypress/buddypress/pull/219

File:

• trunk/src/bp-core/bp-core-functions.php (modified) (5 diffs)

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

@@ -4847 +4847 @@
     // List of versions containing deprecated functions.
     $deprecated_functions_versions = array(
-        '1.2',
-        '1.5',
-        '1.6',
-        '1.7',
-        '1.9',
-        '2.0',
-        '2.1',
-        '2.2',
-        '2.3',
-        '2.4',
-        '2.5',
-        '2.6',
-        '2.7',
-        '2.8',
-        '2.9',
-        '3.0',
-        '4.0',
-        '6.0',
-        '7.0',
-        '8.0',
-        '9.0',
-        '10.0',
-        '11.0',
-        '12.0',
+        1.2,
+        1.5,
+        1.6,
+        1.7,
+        1.9,
+        2.0,
+        2.1,
+        2.2,
+        2.3,
+        2.4,
+        2.5,
+        2.6,
+        2.7,
+        2.8,
+        2.9,
+        3.0,
+        4.0,
+        6.0,
+        7.0,
+        8.0,
+        9.0,
+        10.0,
+        11.0,
+        12.0,
     );
 
@@ -4894 +4894 @@
      */
     $initial_version        = (float) bp_get_initial_version();
-    $current_version        = (float) bp_get_version();
-    $load_latest_deprecated = $initial_version < $current_version;
+    $current_major_version  = (float) bp_get_major_version( bp_get_version() );
+    $load_latest_deprecated = $initial_version < $current_major_version;
 
     // New installs.
@@ -4905 +4905 @@
                     function( $file ) {
                         if ( false !== strpos( $file, '.php' ) ) {
-                            return str_replace( '.php', '', $file );
+                            return (float) str_replace( '.php', '', $file );
                         };
                     },
@@ -4918 +4918 @@
 
         // Only load 12.0 deprecated functions.
-        return array( '12.0' );
-    }
-
-    // Try to get the first major version that was in used when BuddyPress was fist installed.
-    $first_major = '';
-    if ( $initial_version ) {
-        $first_major = bp_get_major_version( $initial_version );
-    }
-
-    $index_first_major = array_search( $first_major, $deprecated_functions_versions, true );
+        return array( 12.0 );
+    }
+
+    $index_first_major = array_search( $initial_version, $deprecated_functions_versions, true );
     if ( false === $index_first_major ) {
         return array_splice( $deprecated_functions_versions, -2 );
@@ -4938 +4932 @@
     }
 
-    $index_initial_version = array_search( $first_major, $latest_deprecated_functions_versions, true );
+    $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 ] );