Ticket #48747: 48747.diff

src/wp-includes/class-wp-customize-manager.php

@@ -3796 +3796 @@
          * @since 3.4.0
          *
          * @param string $id Customize Setting ID.
+         * @return WP_Customize_Setting|null The removed setting object, if any.
          */
         public function remove_setting( $id ) {
+                $setting = $this->get_setting( $id );
                 unset( $this->settings[ $id ] );
+                return $setting;
         }
 
         /**
@@ -3852 +3855 @@
          * @since 4.0.0
          *
          * @param string $id Panel ID to remove.
+         * @return WP_Customize_Panel|null The removed panel object, if any.
          */
         public function remove_panel( $id ) {
                 // Removing core components this way is _doing_it_wrong().
@@ -3865 +3869 @@
 
                         _doing_it_wrong( __METHOD__, $message, '4.5.0' );
                 }
+
+                $panel = $this->get_panel( $id );
                 unset( $this->panels[ $id ] );
+                return $panel;
         }
 
         /**
@@ -3948 +3955 @@
          * @since 3.4.0
          *
          * @param string $id Section ID.
+         * @return WP_Customize_Section|null The removed section object, if any.
          */
         public function remove_section( $id ) {
+                $section = $this->get_section( $id );
                 unset( $this->sections[ $id ] );
+                return $section;
         }
 
         /**
@@ -4040 +4050 @@
          * @since 3.4.0
          *
          * @param string $id ID of the control.
+         * @return WP_Customize_Control|null The removed control object, if any.
          */
         public function remove_control( $id ) {
+                $control = $this->get_control( $id );
                 unset( $this->controls[ $id ] );
+                return $control;
         }
 
         /**