<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14546] trunk: Fix double-tabbing in get_dropins.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14546">14546</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-10 20:41:14 +0000 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix double-tabbing in get_dropins.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (14545 => 14546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-05-10 20:40:15 UTC (rev 14545)
+++ trunk/wp-admin/includes/plugin.php 2010-05-10 20:41:14 UTC (rev 14546)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><span class="cx"> if ( isset( $_dropins[ $file ] ) )
</span><span class="cx"> $plugin_files[] = $file;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> return $dropins;
</span><span class="cx"> }
</span><span class="lines">@@ -345,12 +345,12 @@
</span><span class="cx"> return $dropins;
</span><span class="cx">
</span><span class="cx"> foreach ( $plugin_files as $plugin_file ) {
</span><del>- 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;
</del><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uksort( $dropins, create_function( '$a, $b', 'return strnatcasecmp( $a, $b );' ));
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (14545 => 14546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-05-10 20:40:15 UTC (rev 14545)
+++ trunk/wp-includes/meta.php 2010-05-10 20:41:14 UTC (rev 14546)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><del>- * @param string $meta_key Metadata key
</del><ins>+ * @param string $meta_key Metadata key. Expected unslashed.
</ins><span class="cx"> * @param string $meta_value Metadata value
</span><span class="cx"> * @param bool $unique Optional, default is false. Whether the specified metadata key should be
</span><span class="cx"> * unique for the object. If true, and the object already has a value for the specified
</span><span class="lines">@@ -42,9 +42,6 @@
</span><span class="cx">
</span><span class="cx"> $column = esc_sql($meta_type . '_id');
</span><span class="cx">
</span><del>- // expected_slashed ($meta_key)
- $meta_key = stripslashes($meta_key);
-
</del><span class="cx"> if ( $unique && $wpdb->get_var( $wpdb->prepare(
</span><span class="cx"> "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
</span><span class="cx"> $meta_key, $object_id ) ) )
</span><span class="lines">@@ -82,7 +79,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><del>- * @param string $meta_key Metadata key
</del><ins>+ * @param string $meta_key Metadata key. Expected unslashed.
</ins><span class="cx"> * @param string $meta_value Metadata value
</span><span class="cx"> * @param string $prev_value Optional. If specified, only update existing metadata entries with
</span><span class="cx"> * the specified value. Otherwise, update all entries.
</span><span class="lines">@@ -103,9 +100,6 @@
</span><span class="cx"> $column = esc_sql($meta_type . '_id');
</span><span class="cx"> $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</span><span class="cx">
</span><del>- // expected_slashed ($meta_key)
- $meta_key = stripslashes($meta_key);
-
</del><span class="cx"> if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
</span><span class="cx"> return add_metadata($meta_type, $object_id, $meta_key, $meta_value);
</span><span class="cx">
</span><span class="lines">@@ -143,7 +137,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><del>- * @param string $meta_key Metadata key
</del><ins>+ * @param string $meta_key Metadata key. Expected unslashed.
</ins><span class="cx"> * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
</span><span class="cx"> * with this value. Otherwise, delete all entries with the specified meta_key.
</span><span class="cx"> * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries
</span><span class="lines">@@ -165,8 +159,7 @@
</span><span class="cx">
</span><span class="cx"> $type_column = esc_sql($meta_type . '_id');
</span><span class="cx"> $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</span><del>- // expected_slashed ($meta_key)
- $meta_key = stripslashes($meta_key);
</del><ins>+
</ins><span class="cx"> $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</span><span class="cx">
</span><span class="cx"> $query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
</span></span></pre>
</div>
</div>
</body>
</html>