Changeset 34972

Timestamp:

10/08/2015 11:08:40 PM (9 years ago)

Author:

DrewAPicture

Message:

Embeds: Combine the oembed_minwidth and oembed_maxwidth filters into one, similar to how the existing oembed_defaults works for width and height.

See #32522. See #34227.

File:

• trunk/src/wp-includes/embed-functions.php (modified) (1 diff)

trunk/src/wp-includes/embed-functions.php

@@ -525 +525 @@
 
     /**
-     * Filter the allowed minimum width for the oEmbed response.
+     * Filter the allowed minimum and maximum widths for the oEmbed response.
      *
      * @since 4.4.0
      *
-     * @param int $width The minimum width. Defaults to 200.
-     */
-    $minwidth = apply_filters( 'oembed_minwidth', 200 );
-
-    /**
-     * Filter the allowed maximum width for the oEmbed response.
-     *
-     * @since 4.4.0
-     *
-     * @param int $width The maximum width. Defaults to 600.
-     */
-    $maxwidth = apply_filters( 'oembed_maxwidth', 600 );
-
-    if ( $width < $minwidth ) {
-        $width = $minwidth;
-    } else if ( $width > $maxwidth ) {
-        $width = $maxwidth;
+     * @param array $min_max_width {
+     *     Minimum and maximum widths for the oEmbed response.
+     *
+     *     @type int $min Minimum width. Default 200.
+     *     @type int $max Maximum width. Default 600.
+     * }
+     */
+    $min_max_width = apply_filters( 'oembed_min_max_width', array(
+        'min' => 200,
+        'max' => 600
+    ) );
+
+    if ( $width < $min_max_width['min'] ) {
+        $width = $min_max_width['min'];
+    } elseif ( $width > $min_max_width['max'] ) {
+        $width = $min_max_width['max'];
     }