<!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>[15355] trunk/wp-includes: Alot more tabs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15355">15355</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-06-30 00:05:18 +0000 (Wed, 30 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Alot more tabs. Props jacobsantos & Viper007bond. See <a href="http://trac.wordpress.org/ticket/14147">#14147</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescronphp">trunk/wp-includes/cron.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/capabilities.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -1079,7 +1079,7 @@
</span><span class="cx"> function current_user_can_for_blog( $blog_id, $capability ) {
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx">
</span><del>- if ( is_multisite() && is_super_admin() )
</del><ins>+ if ( is_multisite() && is_super_admin() )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( empty( $current_user ) )
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/category-template.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -731,9 +731,9 @@
</span><span class="cx"> break;
</span><span class="cx"> endswitch;
</span><span class="cx">
</span><del>- if ( $filter )
</del><ins>+ if ( $filter )
</ins><span class="cx"> return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/comment-template.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -678,9 +678,9 @@
</span><span class="cx"> * @param string $pingbacktxt The string to display for pingback type
</span><span class="cx"> */
</span><span class="cx"> function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
</span><del>- if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
- if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
- if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
</del><ins>+ if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+ if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+ if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
</ins><span class="cx"> $type = get_comment_type();
</span><span class="cx"> switch( $type ) {
</span><span class="cx"> case 'trackback' :
</span><span class="lines">@@ -946,10 +946,10 @@
</span><span class="cx"> function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
</span><span class="cx"> global $id, $wpcommentspopupfile, $wpcommentsjavascript;
</span><span class="cx">
</span><del>- if ( false === $zero ) $zero = __( 'No Comments' );
- if ( false === $one ) $one = __( '1 Comment' );
- if ( false === $more ) $more = __( '% Comments' );
- if ( false === $none ) $none = __( 'Comments Off' );
</del><ins>+ if ( false === $zero ) $zero = __( 'No Comments' );
+ if ( false === $one ) $one = __( '1 Comment' );
+ if ( false === $more ) $more = __( '% Comments' );
+ if ( false === $none ) $none = __( 'Comments Off' );
</ins><span class="cx">
</span><span class="cx"> $number = get_comments_number( $id );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cron.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cron.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/cron.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -90,10 +90,10 @@
</span><span class="cx">
</span><span class="cx"> $now = time();
</span><span class="cx">
</span><del>- if ( $timestamp >= $now )
- $timestamp = $now + $interval;
- else
- $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
</del><ins>+ if ( $timestamp >= $now )
+ $timestamp = $now + $interval;
+ else
+ $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
</ins><span class="cx">
</span><span class="cx"> wp_schedule_event( $timestamp, $recurrence, $hook, $args );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/formatting.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -2826,7 +2826,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function capital_P_dangit( $text ) {
</span><del>- return str_replace( 'Wordpress', 'WordPress', $text );
</del><ins>+ return str_replace( 'Wordpress', 'WordPress', $text );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/functions.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> function delete_transient( $transient ) {
</span><span class="cx"> global $_wp_using_ext_object_cache;
</span><span class="cx">
</span><del>- do_action( 'delete_transient_' . $transient, $transient );
</del><ins>+ do_action( 'delete_transient_' . $transient, $transient );
</ins><span class="cx">
</span><span class="cx"> if ( $_wp_using_ext_object_cache ) {
</span><span class="cx"> $result = wp_cache_delete( $transient, 'transient' );
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> function set_transient( $transient, $value, $expiration = 0 ) {
</span><span class="cx"> global $_wp_using_ext_object_cache;
</span><span class="cx">
</span><del>- $value = apply_filters( 'pre_set_transient_' . $transient, $value );
</del><ins>+ $value = apply_filters( 'pre_set_transient_' . $transient, $value );
</ins><span class="cx">
</span><span class="cx"> if ( $_wp_using_ext_object_cache ) {
</span><span class="cx"> $result = wp_cache_set( $transient, $value, 'transient', $expiration );
</span><span class="lines">@@ -3784,7 +3784,7 @@
</span><span class="cx"> function set_site_transient( $transient, $value, $expiration = 0 ) {
</span><span class="cx"> global $_wp_using_ext_object_cache;
</span><span class="cx">
</span><del>- $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
</del><ins>+ $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
</ins><span class="cx">
</span><span class="cx"> if ( $_wp_using_ext_object_cache ) {
</span><span class="cx"> $result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/general-template.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -1542,7 +1542,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $before Optional Output before the date.
</span><span class="cx"> * @param string $after Optional Output after the date.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function the_weekday_date($before='',$after='') {
</span><span class="cx"> global $wp_locale, $post, $day, $previousweekday;
</span><span class="cx"> $the_weekday_date = '';
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/link-template.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -2228,7 +2228,7 @@
</span><span class="cx"> * @uses wp_get_shortlink()
</span><span class="cx"> */
</span><span class="cx"> function wp_shortlink_header() {
</span><del>- if ( headers_sent() )
</del><ins>+ if ( headers_sent() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $shortlink = wp_get_shortlink(0, 'query');
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-thumbnail-template.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-thumbnail-template.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/post-thumbnail-template.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> * @param int $post_id Optional. Post ID.
</span><span class="cx"> * @param string $size Optional. Image size. Defaults to 'thumbnail'.
</span><span class="cx"> * @param string|array $attr Optional. Query string or array of attributes.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
</span><span class="cx"> global $id;
</span><span class="cx"> $post_id = ( NULL === $post_id ) ? $id : $post_id;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/post.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -3505,7 +3505,7 @@
</span><span class="cx"> foreach ( $backup_sizes as $size ) {
</span><span class="cx"> $del_file = path_join( dirname($meta['file']), $size['file'] );
</span><span class="cx"> $del_file = apply_filters('wp_delete_file', $del_file);
</span><del>- @ unlink( path_join($uploadpath['basedir'], $del_file) );
</del><ins>+ @ unlink( path_join($uploadpath['basedir'], $del_file) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3578,10 +3578,10 @@
</span><span class="cx"> if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory
</span><span class="cx"> if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
</span><span class="cx"> $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
</span><del>- elseif ( false !== strpos($file, 'wp-content/uploads') )
- $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
- else
- $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
</del><ins>+ elseif ( false !== strpos($file, 'wp-content/uploads') )
+ $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+ else
+ $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/taxonomy.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -981,22 +981,22 @@
</span><span class="cx">
</span><span class="cx"> $selects = array();
</span><span class="cx"> switch ( $fields ) {
</span><del>- case 'all':
- $selects = array('t.*', 'tt.*');
- break;
- case 'ids':
</del><ins>+ case 'all':
+ $selects = array('t.*', 'tt.*');
+ break;
+ case 'ids':
</ins><span class="cx"> case 'id=>parent':
</span><del>- $selects = array('t.term_id', 'tt.parent', 'tt.count');
- break;
- case 'names':
- $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
- break;
- case 'count':
</del><ins>+ $selects = array('t.term_id', 'tt.parent', 'tt.count');
+ break;
+ case 'names':
+ $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+ break;
+ case 'count':
</ins><span class="cx"> $orderby = '';
</span><span class="cx"> $order = '';
</span><del>- $selects = array('COUNT(*)');
- }
- $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
</del><ins>+ $selects = array('COUNT(*)');
+ }
+ $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
</ins><span class="cx">
</span><span class="cx"> $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/user.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -752,11 +752,11 @@
</span><span class="cx"> $ids[] = $user_object->ID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $metas = get_user_metavalues($ids);
</del><ins>+ $metas = get_user_metavalues($ids);
</ins><span class="cx">
</span><span class="cx"> foreach($users as $user_object) {
</span><span class="cx"> if (isset($metas[$user_object->ID])) {
</span><del>- _fill_single_user($user_object, $metas[$user_object->ID]);
</del><ins>+ _fill_single_user($user_object, $metas[$user_object->ID]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (15354 => 15355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-06-29 23:54:39 UTC (rev 15354)
+++ trunk/wp-includes/wp-db.php 2010-06-30 00:05:18 UTC (rev 15355)
</span><span class="lines">@@ -790,8 +790,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Escape data. Works on arrays.
</span><span class="cx"> *
</span><del>- * @uses wpdb::_escape()
- * @uses wpdb::_real_escape()
</del><ins>+ * @uses wpdb::_escape()
+ * @uses wpdb::_real_escape()
</ins><span class="cx"> * @since 2.8
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>