<!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>[13318] trunk/wp-includes: Revert [13187] pending further debate.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13318">13318</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-23 01:13:37 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/13187">[13187]</a> pending further debate. see <a href="http://trac.wordpress.org/ticket/12267">#12267</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-02-22 23:14:03 UTC (rev 13317)
+++ trunk/wp-includes/classes.php 2010-02-23 01:13:37 UTC (rev 13318)
</span><span class="lines">@@ -1697,102 +1697,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// A factory and constructor that upgrades stdClass "rows" to WordPress classes.
-class wp_row {
- // Factory. Call statically to upgrade a stdClass object to its specialized class: $o = wp_row::get($row).
- function get($row) {
- if ( is_a($row, 'wp_row') || is_subclass_of($row, 'wp_row') )
- return $row;
-
- if ( is_array($row) )
- $row = (object) $row;
-
- $class = 'wp_row';
- if ( isset($row->post_type) ) {
- if ( class_exists("wp_" . $row->post_type) )
- $class = "wp_" . $row->post_type;
- else
- $class = "wp_post";
- } elseif ( isset($row->comment_type) ) {
- if ( class_exists("wp_" . $row->comment_type) )
- $class = "wp_" . $row->comment_type;
- else
- $class = "wp_comment";
- }
-
- if ( function_exists("apply_filters") ) {
- $filtered_class = apply_filters("wp_row_class", $class, $row);
- if ( class_exists($filtered_class) )
- $class = $filtered_class;
- }
-
- return call_user_func(array($class, 'get'), $row);
- }
-
- function wp_row(&$row) {
- return $this->__construct($row);
- }
-
- function __construct($row) {
- if ( is_array($row) )
- $row = (object) $row;
-
- foreach ( (array) $row as $k => $v )
- $this->$k = $row->$k;
- }
-}
-
-class wp_post extends wp_row {
- // Factory
- function get($post) {
- if ( $post = get_post($post) )
- return new wp_post($post);
- else
- return new WP_Error(404, "Post not found.");
- }
-
- function id() { return $this->ID; }
- function post_id() { return $this->ID; }
- function type_id() { return 'post-' . $this->ID; }
- function classes($class='') { return join( ' ', get_post_class( $class, $this->id() ) ); }
-
- function permalink() { return get_permalink($this); }
- function title() { return get_the_title($this); }
- function date($format='') { return; }
- function time($format='') { return get_the_time($format, $this); }
- function author() { $authordata = get_userdata($this->post_author); return $authordata->display_name; }
- function content() { return get_content($this); }
-}
-
-class wp_comment extends wp_row {
- // Factory
- function get($comment) {
- if ( $comment = get_comment($comment) )
- return new wp_comment($comment);
- else
- return new WP_Error(404, "Comment not found.");
- }
-
- function id() { return $this->comment_ID; }
- function post_id() { return $this->comment_post_ID; }
- function type_id() { return 'comment-' . $this->comment_ID; }
- function classes($class='') { return join( ' ', get_comment_class( $class, $this->id() ) ); }
-
- function permalink() { return get_comment_link($this); }
- function title() { return sprintf(__("Comment on %s"), get_the_title($this->post_id())); }
- function time($format='') { return mysql2date($format?$format:get_option('time_format'), $this->comment_date); }
- function date($format='') { return date($format?$format:get_option('date_format'), $this->time('U')); }
- function author() { return $this->comment_author; }
- function excerpt() { return $this->comment_content; }
- function content() { return get_comment_content($this); }
-}
-
-function is_post($object) {
- return is_a('wp_post', $object);
-}
-
-function is_comment($object) {
- return is_a('wp_comment', $object);
-}
-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-22 23:14:03 UTC (rev 13317)
+++ trunk/wp-includes/custom-navigation.php 2010-02-23 01:13:37 UTC (rev 13318)
</span><span class="lines">@@ -203,7 +203,6 @@
</span><span class="cx">
</span><span class="cx"> ?></a><?php
</span><span class="cx"> } elseif ( $type == 'backend' ) {
</span><del>- //BACKEND draggable and droppable elements
</del><span class="cx"> $link_type = $menu_type;
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-02-22 23:14:03 UTC (rev 13317)
+++ trunk/wp-includes/query.php 2010-02-23 01:13:37 UTC (rev 13318)
</span><span class="lines">@@ -2302,10 +2302,6 @@
</span><span class="cx"> if ( !$q['suppress_filters'] )
</span><span class="cx"> $this->posts = apply_filters('posts_results', $this->posts);
</span><span class="cx">
</span><del>- // Turn each row into a classed object, e.g. wp_post, wp_comment.
- if ( is_array($this->posts) )
- $this->posts = array_map(array('wp_row', 'get'), $this->posts);
-
</del><span class="cx"> if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
</span><span class="cx"> $cjoin = apply_filters('comment_feed_join', '');
</span><span class="cx"> $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'");
</span></span></pre>
</div>
</div>
</body>
</html>