Changeset 14546

Timestamp:

05/10/2010 08:41:14 PM (15 years ago)

Author:

nacin

Message:

Fix double-tabbing in get_dropins.

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-includes/meta.php (modified) (6 diffs)

trunk/wp-admin/includes/plugin.php

@@ -335 +335 @@
             if ( isset( $_dropins[ $file ] ) )
                 $plugin_files[] = $file;
-            }
+        }
     } else {
         return $dropins;
@@ -346 +346 @@
 
     foreach ( $plugin_files as $plugin_file ) {
-            if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
-                    continue;
-            $plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-            if ( empty ( $plugin_data['Name'] ) )
-                $plugin_data['Name'] = $plugin_file;
-            $dropins[ $plugin_file ] = $plugin_data;
+        if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
+            continue;
+        $plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+        if ( empty( $plugin_data['Name'] ) )
+            $plugin_data['Name'] = $plugin_file;
+        $dropins[ $plugin_file ] = $plugin_data;
     }
 

trunk/wp-includes/meta.php

@@ -22 +22 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key
+ * @param string $meta_key Metadata key. Expected unslashed.
  * @param string $meta_value Metadata value
  * @param bool $unique Optional, default is false.  Whether the specified metadata key should be
@@ -43 +43 @@
     $column = esc_sql($meta_type . '_id');
 
-    // expected_slashed ($meta_key)
-    $meta_key = stripslashes($meta_key);
-
     if ( $unique && $wpdb->get_var( $wpdb->prepare(
         "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
@@ -83 +80 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key
+ * @param string $meta_key Metadata key. Expected unslashed.
  * @param string $meta_value Metadata value
  * @param string $prev_value Optional.  If specified, only update existing metadata entries with
@@ -103 +100 @@
     $column = esc_sql($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
-
-    // expected_slashed ($meta_key)
-    $meta_key = stripslashes($meta_key);
 
     if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
@@ -144 +138 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key
+ * @param string $meta_key Metadata key. Expected unslashed.
  * @param string $meta_value Optional. Metadata value.  If specified, only delete metadata entries
  *      with this value.  Otherwise, delete all entries with the specified meta_key.
@@ -166 +160 @@
     $type_column = esc_sql($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
-    // expected_slashed ($meta_key)
-    $meta_key = stripslashes($meta_key);
+
     $meta_value = maybe_serialize( stripslashes_deep($meta_value) );