Ticket #32692: 32692.2.diff

src/wp-admin/customize.php

@@ -21 +21 @@
 $url = wp_validate_redirect( $url, home_url( '/' ) );
 if ( $return ) {
         $return = wp_unslash( $return );
+        $return = remove_query_arg( wp_removable_query_args(), $return );
         $return = wp_validate_redirect( $return );
 }
 if ( ! $return ) {

src/wp-admin/includes/misc.php

@@ -865 +865 @@
  * @since 4.2.0
  */
 function wp_admin_canonical_url() {
-        $removable_query_args = array(
-                'message', 'settings-updated', 'saved',
-                'update', 'updated', 'activated',
-                'activate', 'deactivate', 'locked',
-                'deleted', 'trashed', 'untrashed',
-                'enabled', 'disabled', 'skipped',
-                'spammed', 'unspammed',
-                'error',
-        );
-
-        /**
-         * Filter the list of URL parameters to remove.
-         *
-         * @since 4.2.0
-         *
-         * @param array $removable_query_args An array of parameters to remove from the URL.
-         */
-        $removable_query_args = apply_filters( 'removable_query_args', $removable_query_args );
+        $removable_query_args = wp_removable_query_args();
 
         if ( empty( $removable_query_args ) ) {
                 return;

src/wp-includes/functions.php

@@ -825 +825 @@
 }
 
 /**
+ * Returns the list of URL parameters to remove.
+ *
+ * @since 4.4.0
+ *
+ * @return array An array of parameters to remove from the URL.
+ */
+function wp_removable_query_args() {
+        $removable_query_args = array(
+                'message', 'settings-updated', 'saved',
+                'update', 'updated', 'activated',
+                'activate', 'deactivate', 'locked',
+                'deleted', 'trashed', 'untrashed',
+                'enabled', 'disabled', 'skipped',
+                'spammed', 'unspammed',
+        );
+
+        /**
+         * Filter the list of URL parameters to remove.
+         *
+         * @since 4.2.0
+         *
+         * @param array $removable_query_args An array of parameters to remove from the URL.
+         */
+        return apply_filters( 'removable_query_args', $removable_query_args );
+}
+
+/**
  * Walks the array while sanitizing the contents.
  *
  * @since 0.71