Changeset 56864 for branches/4.8/src/wp-includes/class-wp-theme.php

Timestamp:

10/12/2023 02:50:31 PM (3 years ago)

Author:

davidbaumwald

Message:

Grouped backports to the 4.8 branch.

• Comments: Prevent users who can not see a post from seeing comments on it.
• Shortcodes: Restrict media shortcode ajax to certain type.
• REST API: Ensure no-cache headers are sent when methods are overridden.
• REST API: Limit search_columns for users without list_users.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56834], [56835], [56836], [56838], and [56840] to the 4.8 branch.
Props xknown, jorbin, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, antpb, rmccue.

File:

• branches/4.8/src/wp-includes/class-wp-theme.php (modified) (2 diffs)

branches/4.8/src/wp-includes/class-wp-theme.php

@@ -548 +548 @@
 
         /**
+         * Perform reinitialization tasks.
+         *
+         * Prevents a callback from being injected during unserialization of an object.
+         *
+         * @return void
+         */
+        public function __wakeup() {
+                if ( $this->parent && ! $this->parent instanceof self ) {
+                        throw new UnexpectedValueException();
+                }
+                if ( $this->headers && ! is_array( $this->headers ) ) {
+                        throw new UnexpectedValueException();
+                }
+                foreach ( $this->headers as $value ) {
+                        if ( ! is_string( $value ) ) {
+                                throw new UnexpectedValueException();
+                        }
+                }
+                $this->headers_sanitized = array();
+        }
+
+        /**
          * Adds theme data to cache.
          *
@@ -1515 +1537 @@
                 return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
         }
+
+        private static function _check_headers_property_has_correct_type( $headers ) {
+                if ( ! is_array( $headers ) ) {
+                        return false;
+                }
+                foreach ( $headers as $key => $value ) {
+                        if ( ! is_string( $key ) || ! is_string( $value ) ) {
+                                return false;
+                        }
+                }
+                return true;
+        }
 }