Changeset 53986

Timestamp:

08/30/2022 03:56:55 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Grouped backports to the 3.7 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 3.7 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (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/3.7/src/wp-admin/plugins.php

@@ -373 +373 @@
 if ( !empty($invalid) )
     foreach ( $invalid as $plugin_file => $error )
-        echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>';
+        echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), esc_html( $error->get_error_message() ) ) . '</p></div>';
 ?>
 
@@ -398 +398 @@
 
         if ( is_wp_error($delete_result) ) : ?>
-        <div id="message" class="updated"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+        <div id="message" class="updated"><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"><p><?php _e('The selected plugins have been <strong>deleted</strong>.'); ?></p></div>

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

@@ -257 +257 @@
     $query .= " ORDER BY $orderby $order";
     if ($limit != -1)
-        $query .= " LIMIT $limit";
+        $query .= ' LIMIT ' . absint( $limit );
 
     $results = $wpdb->get_results($query);

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

@@ -732 +732 @@
  * Display list of post custom fields.
  *
- * @internal This will probably change at some point...
  * @since 1.2.0
- * @uses apply_filters() Calls 'the_meta_key' on list item HTML content, with key and value as separate parameters.
+ *
+ * @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";
@@ -745 +746 @@
             $values = array_map('trim', get_post_custom_values($key));
             $value = implode($values,', ');
-            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";