Merge branch 'WordPress:trunk' into 60017-wp_suspend_cache_addition

WordPress · Dec 6, 2023 · d134de7 · d134de7
2 parents 6efe0af + 52854e2
commit d134de7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/wp-includes/html-api/class-wp-html-token.php b/src/wp-includes/html-api/class-wp-html-token.php
@@ -94,4 +94,13 @@ public function __destruct() {
 			call_user_func( $this->on_destroy, $this->bookmark_name );
 		}
 	}
+
+	/**
+	 * Wakeup magic method.
+	 *
+	 * @since 6.4.2
+	 */
+	public function __wakeup() {
+		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+	}
 }
diff --git a/src/wp-includes/pomo/translations.php b/src/wp-includes/pomo/translations.php
@@ -247,7 +247,10 @@ public function make_plural_form_function( $nplurals, $expression ) {
 
 		/**
 		 * Adds parentheses to the inner parts of ternary operators in
-		 * plural expressions, because PHP evaluates ternary oerators from left to right
+		 * plural expressions, because PHP evaluates ternary operators from left to right
+		 *
+		 * @deprecated 6.5.0 Use the Plural_Forms class instead.
+		 * @see Plural_Forms
 		 *
 		 * @param string $expression the expression without parentheses
 		 * @return string the expression with parentheses added