Ticket #8726: 8726.patch

src/bp-core/bp-core-avatars.php

@@ -456 +456 @@
 
         // Use an alias to leave the param unchanged.
         $avatar_classes = $params['class'];
-        if ( ! is_array( $avatar_classes ) ) {
+        if ( is_null( $avatar_classes ) ) {
+                $avatar_classes = array();
+        } elseif ( ! is_array( $avatar_classes ) ) {
                 $avatar_classes = explode( ' ', $avatar_classes );
         }
 

src/bp-core/classes/class-bp-core-bp-nav-backcompat.php

@@ -60 +60 @@
          * @param mixed $offset Array offset.
          * @param array $value  Nav item.
          */
+        #[ReturnTypeWillChange]
         public function offsetSet( $offset, $value ) {
                 _doing_it_wrong(
                         'bp_nav',
@@ -94 +95 @@
          * @param mixed $offset Array offset.
          * @return BP_Core_BP_Nav_BackCompat
          */
+        #[ReturnTypeWillChange]
         public function offsetGet( $offset ) {
                 _doing_it_wrong(
                         'bp_nav',
@@ -101 +103 @@
                         '2.6.0'
                 );
 
-//              if ( ! isset( $this->backcompat_nav[ $offset ] ) ) {
-                        $nav = $this->get_nav( $offset );
-                        if ( $nav && isset( $nav[ $offset ] ) ) {
-                                $this->backcompat_nav[ $offset ] = new self( $nav[ $offset ] );
-                        }
-//              }
+                $nav = $this->get_nav( $offset );
+                if ( $nav && isset( $nav[ $offset ] ) ) {
+                        $this->backcompat_nav[ $offset ] = new self( $nav[ $offset ] );
+                }
 
                 return $this->backcompat_nav[ $offset ];
         }
@@ -119 +119 @@
          * @param mixed $offset Array offset.
          * @return bool
          */
+        #[ReturnTypeWillChange]
         public function offsetExists( $offset ) {
                 _doing_it_wrong(
                         'bp_nav',
@@ -145 +146 @@
          *
          * @param mixed $offset Array offset.
          */
+        #[ReturnTypeWillChange]
         public function offsetUnset( $offset ) {
                 _doing_it_wrong(
                         'bp_nav',