Changeset 53977 for branches/4.6

Timestamp:

08/30/2022 03:47:30 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Grouped backports to the 4.6 branch.

• Posts, Post Types: Escape output within the_meta().
• General: Ensure bookmark query limits are numeric.
• Plugins: Escape output in error messages.

Merges [53958-53960] to the 4.6 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-admin/plugins.php (modified) (2 diffs)
• src/wp-includes/bookmark.php (modified) (1 diff)
• src/wp-includes/post-template.php (modified) (2 diffs)

branches/4.6/src/wp-admin/plugins.php

@@ -424 +424 @@
             __( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
             '<code>' . esc_html( $plugin_file ) . '</code>',
-            $error->get_error_message() );
+            esc_html( $error->get_error_message() ) );
         echo '</p></div>';
     }
@@ -459 +459 @@
 
         if ( is_wp_error($delete_result) ) : ?>
-        <div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+        <div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), esc_html( $delete_result->get_error_message() ) ); ?></p></div>
         <?php else : ?>
         <div id="message" class="updated notice is-dismissible">

branches/4.6/src/wp-includes/bookmark.php

@@ -282 +282 @@
     $query .= " ORDER BY $orderby $order";
     if ( $r['limit'] != -1 ) {
-        $query .= ' LIMIT ' . $r['limit'];
+        $query .= ' LIMIT ' . absint( $r['limit'] );
     }
 

branches/4.6/src/wp-includes/post-template.php

@@ -976 +976 @@
  * @since 1.2.0
  *
- * @internal This will probably change at some point...
- *
+ * @deprecated 6.0.2 Use get_post_meta() to retrieve post meta and render manually.
  */
 function the_meta() {
+    _deprecated_function( __FUNCTION__, '6.0.2', 'get_post_meta()' );
     if ( $keys = get_post_custom_keys() ) {
         echo "<ul class='post-meta'>\n";
@@ -998 +998 @@
              * @param string $value Meta value.
              */
-            echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
+            echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>" . esc_html( $key ) . ":</span>" . esc_html( $value ) . "</li>\n", $key, $value );
         }
         echo "</ul>\n";