<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11943] trunk: First pass commentmeta implementation.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11943">11943</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-09-17 20:17:33 +0000 (Thu, 17 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass commentmeta implementation. See <a href="http://trac.wordpress.org/ticket/2659">#2659</a> props scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-admin/includes/schema.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -54,6 +54,15 @@
</span><span class="cx"> PRIMARY KEY (object_id,term_taxonomy_id),
</span><span class="cx"> KEY term_taxonomy_id (term_taxonomy_id)
</span><span class="cx"> ) $charset_collate;
</span><ins>+CREATE TABLE $wpdb->commentmeta (
+ meta_id bigint(20) unsigned NOT NULL auto_increment,
+ comment_id bigint(20) unsigned NOT NULL default '0',
+ meta_key varchar(255) default NULL,
+ meta_value longtext,
+ PRIMARY KEY (meta_id),
+ KEY post_id (comment_id),
+ KEY meta_key (meta_key)
+) $charset_collate;
</ins><span class="cx"> CREATE TABLE $wpdb->comments (
</span><span class="cx"> comment_ID bigint(20) unsigned NOT NULL auto_increment,
</span><span class="cx"> comment_post_ID bigint(20) unsigned NOT NULL default '0',
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-includes/comment.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -361,7 +361,89 @@
</span><span class="cx"> return $comment_count;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+//
+// Comment meta functions
+//
+
</ins><span class="cx"> /**
</span><ins>+ * Add meta data field to a comment.
+ *
+ * Post meta data is called "Custom Fields" on the Administration Panels.
+ *
+ * @since 2.9
+ * @uses add_metadata
+ * @link http://codex.wordpress.org/Function_Reference/add_comment_meta
+ *
+ * @param int $comment_id Post ID.
+ * @param string $key Metadata name.
+ * @param mixed $value Metadata value.
+ * @param bool $unique Optional, default is false. Whether the same key should not be added.
+ * @return bool False for failure. True for success.
+ */
+function add_comment_meta($comment_id, $meta_key, $meta_value, $unique = false) {
+ return add_metadata('comment', $comment_id, $meta_key, $meta_value, $unique);
+}
+
+/**
+ * Remove metadata matching criteria from a comment.
+ *
+ * You can match based on the key, or key and value. Removing based on key and
+ * value, will keep from removing duplicate metadata with the same key. It also
+ * allows removing all metadata matching key, if needed.
+ *
+ * @since 2.9
+ * @uses delete_metadata
+ * @link http://codex.wordpress.org/Function_Reference/delete_comment_meta
+ *
+ * @param int $comment_id comment ID
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Optional. Metadata value.
+ * @return bool False for failure. True for success.
+ */
+function delete_comment_meta($comment_id, $meta_key, $meta_value = '') {
+ return delete_metadata('comment', $comment_id, $meta_key, $meta_value);
+}
+
+/**
+ * Retrieve comment meta field for a comment.
+ *
+ * @since 2.9
+ * @uses get_metadata
+ * @link http://codex.wordpress.org/Function_Reference/get_comment_meta
+ *
+ * @param int $comment_id Post ID.
+ * @param string $key The meta key to retrieve.
+ * @param bool $single Whether to return a single value.
+ * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
+ * is true.
+ */
+function get_comment_meta($comment_id, $key, $single = false) {
+ return get_metadata('comment', $comment_id, $key, $single);
+}
+
+/**
+ * Update comment meta field based on comment ID.
+ *
+ * Use the $prev_value parameter to differentiate between meta fields with the
+ * same key and comment ID.
+ *
+ * If the meta field for the comment does not exist, it will be added.
+ *
+ * @since 2.9
+ * @uses update_metadata
+ * @link http://codex.wordpress.org/Function_Reference/update_comment_meta
+ *
+ * @param int $comment_id Post ID.
+ * @param string $key Metadata key.
+ * @param mixed $value Metadata value.
+ * @param mixed $prev_value Optional. Previous value to check before removing.
+ * @return bool False on failure, true if success.
+ */
+function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value = '') {
+ return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
+}
+
+/**
</ins><span class="cx"> * Sanitizes the cookies sent to the user already.
</span><span class="cx"> *
</span><span class="cx"> * Will only do anything if the cookies have already been created for the user.
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/meta.php (0 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php (rev 0)
+++ trunk/wp-includes/meta.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -0,0 +1,212 @@
</span><ins>+<?php
+/**
+ * Meta API
+ *
+ * Functions for retrieving and manipulating metadata
+ *
+ * @package WordPress
+ * @subpackage Meta
+ * @since 2.9.0
+ */
+
+function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = false) {
+ if ( !$meta_type || !$meta_key )
+ return false;
+
+ if ( ! $table = _get_meta_table($meta_type) )
+ return false;
+
+ global $wpdb;
+
+ $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",
+ $meta_key, $object_id ) ) )
+ return false;
+
+ $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+
+ $wpdb->insert( $table, array(
+ $column => $object_id,
+ 'meta_key' => $meta_key,
+ 'meta_value' => $meta_value
+ ) );
+
+ wp_cache_delete($object_id, $meta_type . '_meta');
+
+ do_action( "added_{$meta_type}_meta", $wpdb->insert_id, $object_id, $meta_key, $meta_value );
+
+ return true;
+}
+
+function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
+ if ( !$meta_type || !$meta_key )
+ return false;
+
+ if ( ! $table = _get_meta_table($meta_type) )
+ return false;
+
+ global $wpdb;
+
+ $column = esc_sql($meta_type . '_id');
+
+ // expected_slashed ($meta_key)
+ $meta_key = stripslashes($meta_key);
+
+ if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
+ return add_metadata($meta_type, $object_id, $meta_key, $meta_value);
+
+ $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+
+ $data = compact( 'meta_value' );
+ $where = array( $column => $object_id, 'meta_key' => $meta_key );
+
+ if ( !empty( $prev_value ) ) {
+ $prev_value = maybe_serialize($prev_value);
+ $where['meta_value'] = $prev_value;
+ }
+
+ do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $meta_value );
+
+ $wpdb->update( $table, $data, $where );
+ wp_cache_delete($object_id, $meta_type . '_meta');
+
+ do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $meta_value );
+
+ return true;
+}
+
+function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '') {
+ if ( !$meta_type || !$meta_key )
+ return false;
+
+ if ( ! $table = _get_meta_table($meta_type) )
+ return false;
+
+ global $wpdb;
+
+ $column = esc_sql($meta_type . '_id');
+
+ // expected_slashed ($meta_key)
+ $meta_key = stripslashes($meta_key);
+ $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+
+ $query = $wpdb->prepare( "DELETE FROM $table WHERE meta_key = %s", $meta_key );
+
+ if ( $meta_value )
+ $query .= $wpdb->prepare("AND meta_value = %s", $meta_value );
+
+ $count = $wpdb->query($query);
+
+ if ( !$count )
+ return false;
+
+ wp_cache_delete($object_id, $meta_type . '_meta');
+
+ do_action( "deleted_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $meta_value );
+
+ return true;
+}
+
+function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
+ if ( !$meta_type )
+ return false;
+
+ $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+
+ if ( !$meta_cache ) {
+ update_meta_cache($meta_type, $object_id);
+ $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+ }
+
+ if ( ! $meta_key )
+ return $meta_cache;
+
+ if ( isset($meta_cache[$meta_key]) ) {
+ if ( $single ) {
+ return maybe_unserialize( $meta_cache[$meta_key][0] );
+ } else {
+ return array_map('maybe_unserialize', $meta_cache[$meta_key]);
+ }
+ }
+
+ return false;
+}
+
+function update_meta_cache($meta_type, $object_ids) {
+ if ( empty( $meta_type ) || empty( $object_ids ) )
+ return false;
+
+ if ( ! $table = _get_meta_table($meta_type) )
+ return false;
+
+ $column = esc_sql($meta_type . '_id');
+
+ global $wpdb;
+
+ if ( !is_array($object_ids) ) {
+ $object_ids = preg_replace('|[^0-9,]|', '', $object_ids);
+ $object_ids = explode(',', $object_ids);
+ }
+
+ $object_ids = array_map('intval', $object_ids);
+
+ $cache_key = $meta_type . '_meta';
+ $ids = array();
+ foreach ( $object_ids as $id ) {
+ if ( false === wp_cache_get($id, $cache_key) )
+ $ids[] = $id;
+ }
+
+ if ( empty( $ids ) )
+ return false;
+
+ // Get meta info
+ $id_list = join(',', $ids);
+ $cache = array();
+ $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
+ $meta_type), ARRAY_A );
+
+ if ( !empty($meta_list) ) {
+ foreach ( $meta_list as $metarow) {
+ $mpid = intval($metarow[$column]);
+ $mkey = $metarow['meta_key'];
+ $mval = $metarow['meta_value'];
+
+ // Force subkeys to be array type:
+ if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) )
+ $cache[$mpid] = array();
+ if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) )
+ $cache[$mpid][$mkey] = array();
+
+ // Add a value to the current pid/key:
+ $cache[$mpid][$mkey][] = $mval;
+ }
+ }
+
+ foreach ( $ids as $id ) {
+ if ( ! isset($cache[$id]) )
+ $cache[$id] = array();
+ }
+
+ foreach ( array_keys($cache) as $object)
+ wp_cache_set($object, $cache[$object], $cache_key);
+
+ return $cache;
+}
+
+function _get_meta_table($type) {
+ global $wpdb;
+
+ $table_name = $type . 'meta';
+
+ if ( empty($wpdb->$table_name) )
+ return false;
+
+ return $wpdb->$table_name;
+}
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-includes/post.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -511,30 +511,11 @@
</span><span class="cx"> * @return bool False for failure. True for success.
</span><span class="cx"> */
</span><span class="cx"> function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
</span><del>- if ( !$meta_key )
- return false;
-
- global $wpdb;
-
</del><span class="cx"> // make sure meta is added to the post, not a revision
</span><span class="cx"> if ( $the_post = wp_is_post_revision($post_id) )
</span><span class="cx"> $post_id = $the_post;
</span><span class="cx">
</span><del>- // expected_slashed ($meta_key)
- $meta_key = stripslashes($meta_key);
-
- if ( $unique && $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) ) )
- return false;
-
- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
-
- $wpdb->insert( $wpdb->postmeta, compact( 'post_id', 'meta_key', 'meta_value' ) );
-
- wp_cache_delete($post_id, 'post_meta');
-
- do_action( 'added_post_meta', $wpdb->insert_id, $post_id, $meta_key, $meta_value );
-
- return true;
</del><ins>+ return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -554,39 +535,11 @@
</span><span class="cx"> * @return bool False for failure. True for success.
</span><span class="cx"> */
</span><span class="cx"> function delete_post_meta($post_id, $meta_key, $meta_value = '') {
</span><del>- global $wpdb;
-
</del><span class="cx"> // make sure meta is added to the post, not a revision
</span><span class="cx"> if ( $the_post = wp_is_post_revision($post_id) )
</span><span class="cx"> $post_id = $the_post;
</span><span class="cx">
</span><del>- // expected_slashed ($meta_key, $meta_value)
- $meta_key = stripslashes( $meta_key );
- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
-
- if ( !$meta_key )
- return false;
-
- if ( empty( $meta_value ) )
- $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $meta_key ) );
- else
- $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
-
- if ( !$meta_id )
- return false;
-
- do_action( 'delete_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-
- if ( empty( $meta_value ) )
- $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $meta_key ) );
- else
- $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
-
- wp_cache_delete($post_id, 'post_meta');
-
- do_action( 'deleted_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-
- return true;
</del><ins>+ return delete_metadata('post', $post_id, $meta_key, $meta_value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -603,27 +556,7 @@
</span><span class="cx"> * is true.
</span><span class="cx"> */
</span><span class="cx"> function get_post_meta($post_id, $key, $single = false) {
</span><del>- if ( !$key )
- return '';
-
- $post_id = (int) $post_id;
-
- $meta_cache = wp_cache_get($post_id, 'post_meta');
-
- if ( !$meta_cache ) {
- update_postmeta_cache($post_id);
- $meta_cache = wp_cache_get($post_id, 'post_meta');
- }
-
- if ( isset($meta_cache[$key]) ) {
- if ( $single ) {
- return maybe_unserialize( $meta_cache[$key][0] );
- } else {
- return array_map('maybe_unserialize', $meta_cache[$key]);
- }
- }
-
- return '';
</del><ins>+ return get_metadata('post', $post_id, $key, $single);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -645,40 +578,11 @@
</span><span class="cx"> * @return bool False on failure, true if success.
</span><span class="cx"> */
</span><span class="cx"> function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
</span><del>- global $wpdb;
-
</del><span class="cx"> // make sure meta is added to the post, not a revision
</span><span class="cx"> if ( $the_post = wp_is_post_revision($post_id) )
</span><span class="cx"> $post_id = $the_post;
</span><span class="cx">
</span><del>- // expected_slashed ($meta_key)
- $meta_key = stripslashes($meta_key);
-
- if ( !$meta_key )
- return false;
-
- $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) );
- if ( ! $meta_id )
- return add_post_meta($post_id, $meta_key, $meta_value);
-
- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
-
- $data = compact( 'meta_value' );
- $where = compact( 'meta_key', 'post_id' );
-
- if ( !empty( $prev_value ) ) {
- $prev_value = maybe_serialize($prev_value);
- $where['meta_value'] = $prev_value;
- }
-
- do_action( 'update_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-
- $wpdb->update( $wpdb->postmeta, $data, $where );
- wp_cache_delete($post_id, 'post_meta');
-
- do_action( 'updated_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-
- return true;
</del><ins>+ return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -3304,56 +3208,7 @@
</span><span class="cx"> * @return bool|array Returns false if there is nothing to update or an array of metadata.
</span><span class="cx"> */
</span><span class="cx"> function update_postmeta_cache($post_ids) {
</span><del>- global $wpdb;
-
- if ( empty( $post_ids ) )
- return false;
-
- if ( !is_array($post_ids) ) {
- $post_ids = preg_replace('|[^0-9,]|', '', $post_ids);
- $post_ids = explode(',', $post_ids);
- }
-
- $post_ids = array_map('intval', $post_ids);
-
- $ids = array();
- foreach ( (array) $post_ids as $id ) {
- if ( false === wp_cache_get($id, 'post_meta') )
- $ids[] = $id;
- }
-
- if ( empty( $ids ) )
- return false;
-
- // Get post-meta info
- $id_list = join(',', $ids);
- $cache = array();
- if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id IN ($id_list)", ARRAY_A) ) {
- foreach ( (array) $meta_list as $metarow) {
- $mpid = (int) $metarow['post_id'];
- $mkey = $metarow['meta_key'];
- $mval = $metarow['meta_value'];
-
- // Force subkeys to be array type:
- if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) )
- $cache[$mpid] = array();
- if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) )
- $cache[$mpid][$mkey] = array();
-
- // Add a value to the current pid/key:
- $cache[$mpid][$mkey][] = $mval;
- }
- }
-
- foreach ( (array) $ids as $id ) {
- if ( ! isset($cache[$id]) )
- $cache[$id] = array();
- }
-
- foreach ( (array) array_keys($cache) as $post)
- wp_cache_set($post, $cache[$post], 'post_meta');
-
- return $cache;
</del><ins>+ return update_meta_cache('post', $post_ids);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-includes/version.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 11557;
</del><ins>+$wp_db_version = 11943;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-includes/wp-db.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -209,6 +209,15 @@
</span><span class="cx"> var $postmeta;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * WordPress Comment Metadata table
+ *
+ * @since 2.9
+ * @access public
+ * @var string
+ */
+ var $commentmeta;
+
+ /**
</ins><span class="cx"> * WordPress User Metadata table
</span><span class="cx"> *
</span><span class="cx"> * @since 2.3.0
</span><span class="lines">@@ -252,7 +261,7 @@
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><span class="cx"> var $tables = array('users', 'usermeta', 'posts', 'categories', 'post2cat', 'comments', 'links', 'link2cat', 'options',
</span><del>- 'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
</del><ins>+ 'postmeta', 'terms', 'term_taxonomy', 'term_relationships', 'commentmeta');
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of deprecated WordPress tables
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (11942 => 11943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2009-09-17 16:59:33 UTC (rev 11942)
+++ trunk/wp-settings.php 2009-09-17 20:17:33 UTC (rev 11943)
</span><span class="lines">@@ -332,6 +332,7 @@
</span><span class="cx"> require (ABSPATH . WPINC . '/query.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/theme.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/user.php');
</span><ins>+require (ABSPATH . WPINC . '/meta.php');
</ins><span class="cx"> require (ABSPATH . WPINC . '/general-template.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/link-template.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/author-template.php');
</span></span></pre>
</div>
</div>
</body>
</html>