<!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" />
<title>[19054] trunk: Pinking shears</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19054">19054</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-24 19:13:23 +0000 (Mon, 24 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssiertldevcss">trunk/wp-admin/css/ie-rtl.dev.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjseditordevjs">trunk/wp-admin/js/editor.dev.js</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesfunctionswpstylesphp">trunk/wp-includes/functions.wp-styles.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.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="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssiertldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie-rtl.dev.css (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie-rtl.dev.css 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/css/ie-rtl.dev.css 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> position: static;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* nav menus
</del><ins>+/* nav menus
</ins><span class="cx"> .menu-max-depth-0 #menu-management { width: 460px; }
</span><span class="cx"> .menu-max-depth-1 #menu-management { width: 490px; }
</span><span class="cx"> .menu-max-depth-2 #menu-management { width: 520px; }
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/edit-form-advanced.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -212,23 +212,23 @@
</span><span class="cx"> } elseif ( 'page' == $post_type ) {
</span><span class="cx"> $about_pages = '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
</span><span class="cx"> '<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'id' => 'about-pages',
</span><span class="cx"> 'title' => __('About Pages'),
</span><span class="cx"> 'content' => $about_pages,
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $page_attributes = '<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'id' => 'page-attributes',
</span><span class="cx"> 'title' => __('Page Attributes'),
</span><span class="cx"> 'content' => $page_attributes,
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_screen->add_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/edit-tags.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $tax->cap->edit_terms ) )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><del>-
- $tag = get_term( $tag_ID, $taxonomy );
</del><ins>+
+ $tag = get_term( $tag_ID, $taxonomy );
</ins><span class="cx"> if ( ! $tag )
</span><span class="cx"> wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -864,7 +864,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> endif; // hierarchical
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$bulk ) : ?>
</span><span class="cx">
</span><span class="cx"> <label>
</span><span class="lines">@@ -996,7 +996,7 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
</del><ins>+ <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
</ins><span class="cx"> $post_formats = get_theme_support( 'post-formats' );
</span><span class="cx"> if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) :
</span><span class="cx"> $all_post_formats = get_post_format_strings(); ?>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1539,7 +1539,7 @@
</span><span class="cx"> $this->id = (int) $_GET[$urlholder];
</span><span class="cx"> $attachment = get_post( $this->id );
</span><span class="cx"> if ( empty($attachment) )
</span><del>- wp_die(__('Please select a file'));
</del><ins>+ wp_die(__('Please select a file'));
</ins><span class="cx">
</span><span class="cx"> $this->filename = $attachment->post_title;
</span><span class="cx"> $this->package = get_attached_file( $attachment->ID );
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/deprecated.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_tiny_mce() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_editor('', 'content');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/file.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> $new_file = $uploads['path'] . "/$filename";
</span><span class="cx"> copy( $tmp_file, $new_file );
</span><span class="cx"> unlink($tmp_file);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set correct file permissions
</span><span class="cx"> $stat = stat( dirname( $new_file ));
</span><span class="cx"> $perms = $stat['mode'] & 0000666;
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/media.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1363,7 +1363,7 @@
</span><span class="cx"> <?php do_action('post-html-upload-ui'); ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
</del><ins>+<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
</ins><span class="cx"> <?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -2004,7 +2004,7 @@
</span><span class="cx"> printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
</span><span class="cx"> ?>
</span><span class="cx"> </label></p>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_action( 'post-upload-ui', 'media_upload_max_image_resize' );
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/post.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> * Calls wp_write_post() and handles the errors.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><del>-
</del><ins>+
</ins><span class="cx"> * @uses wp_write_post()
</span><span class="cx"> * @uses is_wp_error()
</span><span class="cx"> * @uses wp_die()
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/includes/screen.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><span class="cx"> private $_help_tabs = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * The help sidebar data associated with screen, if any.
</span><span class="cx"> *
</span><span class="lines">@@ -395,10 +395,10 @@
</span><span class="cx"> * @return WP_Screen Screen object.
</span><span class="cx"> */
</span><span class="cx"> public function get( $hook_name = '' ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_a( $hook_name, 'WP_Screen' ) )
</span><span class="cx"> return $hook_name;
</span><del>-
</del><ins>+
</ins><span class="cx"> $action = $post_type = $taxonomy = '';
</span><span class="cx">
</span><span class="cx"> if ( $hook_name ) {
</span><span class="lines">@@ -425,12 +425,12 @@
</span><span class="cx"> $action = 'add';
</span><span class="cx"> $id = str_replace( array( '-new', '-add' ), '', $id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'index' == $id )
</span><span class="cx"> $id = 'dashboard';
</span><del>-
</del><ins>+
</ins><span class="cx"> $base = $id;
</span><del>-
</del><ins>+
</ins><span class="cx"> // If this is the current screen, see if we can be more accurate for post types and taxonomies.
</span><span class="cx"> if ( ! $hook_name ) {
</span><span class="cx"> switch ( $base ) {
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ( $base ) {
</span><span class="cx"> case 'post' :
</span><span class="cx"> if ( ! $post_type )
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> $id = 'edit-' . $taxonomy;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_network_admin() ) {
</span><span class="cx"> $id .= '-network';
</span><span class="cx"> $base .= '-network';
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> $id .= '-user';
</span><span class="cx"> $base .= '-user';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( self::$_registry[ $id ] ) )
</span><span class="cx"> return self::$_registry[ $id ];
</span><span class="cx">
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">
</span><span class="cx"> return $screen;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Makes the screen object the current screen.
</span><span class="cx"> *
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> * @param string $help Help text.
</span><span class="cx"> */
</span><span class="cx"> static function add_old_compat_help( $screen, $help ) {
</span><del>- self::$_old_compat_help[ $screen->id ] = $help;
</del><ins>+ self::$_old_compat_help[ $screen->id ] = $help;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/js/common.dev.js 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> height;
</span><span class="cx">
</span><span class="cx"> columns.height('auto');
</span><del>-
</del><ins>+
</ins><span class="cx"> height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) );
</span><span class="cx"> columns.height( height );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjseditordevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/editor.dev.js (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/editor.dev.js 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/js/editor.dev.js 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx">
</span><span class="cx"> var switchEditors = {
</span><del>-
</del><ins>+
</ins><span class="cx"> go: function(a) {
</span><span class="cx"> var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4),
</span><span class="cx"> ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'tmce' == mode ) {
</span><span class="cx"> if ( ed && ! ed.isHidden() )
</span><span class="cx"> return false;
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
</span><span class="cx"> txtarea_el.value = t.wpautop( txtarea_el.value );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ed ) {
</span><span class="cx"> ed.show();
</span><span class="cx"> } else {
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx"> dom.removeClass(wrap_id, 'html-active');
</span><span class="cx"> dom.addClass(wrap_id, 'tmce-active');
</span><span class="cx"> setUserSetting('editor', 'tinymce');
</span><del>-
</del><ins>+
</ins><span class="cx"> } else if ( 'html' == mode ) {
</span><span class="cx">
</span><span class="cx"> if ( ed && ed.isHidden() )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ed ) {
</span><span class="cx"> txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px';
</span><span class="cx"> ed.hide();
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> _wp_Nop : function(content) {
</span><span class="cx"> var blocklist1, blocklist2;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/network.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> // create network tables
</span><span class="cx"> install_network();
</span><span class="cx"> $hostname = get_clean_basedomain();
</span><del>- $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
</del><ins>+ $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
</ins><span class="cx"> if ( ! network_domain_check() ) {
</span><span class="cx"> $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/press-this.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -578,10 +578,10 @@
</span><span class="cx">
</span><span class="cx"> if ( $url ) {
</span><span class="cx"> $content .= '<p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $selection )
</span><span class="cx"> $content .= __('via ');
</span><del>-
</del><ins>+
</ins><span class="cx"> $content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_editor( $content, 'content', $editor_settings );
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx"> <td><input type="button" class="button" onclick="image_selector()" value="<?php esc_attr_e('Insert Image'); ?>" /></td>
</span><span class="cx"> </tr></table>
</span><span class="cx"> </div>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> do_action('admin_footer');
</span><span class="cx"> do_action('admin_print_footer_scripts');
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-admin/update-core.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> wp_enqueue_style( 'plugin-install' );
</span><span class="cx"> wp_enqueue_script( 'plugin-install' );
</span><span class="cx"> add_thickbox();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() && ! is_network_admin() ) {
</span><span class="cx"> wp_redirect( network_admin_url( 'update-core.php' ) );
</span><span class="cx"> exit();
</span><span class="lines">@@ -250,11 +250,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> $upgrade_notice = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&TB_iframe=true&width=640&height=662');
</span><del>- $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
</del><ins>+ $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
</ins><span class="cx"> $details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);
</span><del>-
</del><ins>+
</ins><span class="cx"> echo "
</span><span class="cx"> <tr class='active'>
</span><span class="cx"> <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/class-http.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1626,12 +1626,12 @@
</span><span class="cx"> * Decompression of deflated string while staying compatible with the majority of servers.
</span><span class="cx"> *
</span><span class="cx"> * Certain Servers will return deflated data with headers which PHP's gziniflate()
</span><del>- * function cannot handle out of the box. The following function has been created from
- * various snippets on the gzinflate() PHP documentation.
</del><ins>+ * function cannot handle out of the box. The following function has been created from
+ * various snippets on the gzinflate() PHP documentation.
</ins><span class="cx"> *
</span><span class="cx"> * Warning: Magic numbers within. Due to the potential different formats that the compressed
</span><span class="cx"> * data may be returned in, some "magic offsets" are needed to ensure proper decompression
</span><del>- * takes place. For a simple progmatic way to determine the magic offset in use, see:
</del><ins>+ * takes place. For a simple progmatic way to determine the magic offset in use, see:
</ins><span class="cx"> * http://core.trac.wordpress.org/ticket/18273
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.1
</span></span></pre></div>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/class-wp-editor.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
</span><span class="cx"> $mce_buttons_2[$key] = 'wp_fullscreen';
</span><span class="cx"> elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
</span><del>- $mce_buttons_3[$key] = 'wp_fullscreen';
</del><ins>+ $mce_buttons_3[$key] = 'wp_fullscreen';
</ins><span class="cx"> elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
</span><span class="cx"> $mce_buttons_4[$key] = 'wp_fullscreen';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/functions.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -2826,10 +2826,10 @@
</span><span class="cx"> nocache_headers();
</span><span class="cx"> header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($title) )
</span><span class="cx"> $title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
</span><del>-
</del><ins>+
</ins><span class="cx"> $text_direction = 'ltr';
</span><span class="cx"> if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
</span><span class="cx"> $text_direction = 'rtl';
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/functions.wp-scripts.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> * The $data array is JSON encoded. If called more than once for the same $handle with the same $name,
</span><span class="cx"> * the object would contain all values. In that case if two or more keys are the same,
</span><span class="cx"> * the last value overwrites the previous. The function is named "localize_script" because of historical reasons.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since r16
</span><span class="cx"> * @see WP_Scripts::add_script_data()
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-styles.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-styles.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/functions.wp-styles.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> * Accepts a string $data containing the CSS. If two or more CSS code blocks are
</span><span class="cx"> * added to the same stylesheet $handle, they will be printed in the order
</span><span class="cx"> * they were added, i.e. the latter added styles can redeclare the previous.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.3
</span><span class="cx"> * @see WP_Scripts::add_inline_style()
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/link-template.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1128,7 +1128,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $excluded_categories = array_map( 'intval', $excluded_categories );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty( $cat_array ) ) {
</span><span class="cx"> $excluded_categories = array_diff($excluded_categories, $cat_array);
</span><span class="cx"> $posts_in_ex_cats_sql = '';
</span><span class="lines">@@ -1276,7 +1276,7 @@
</span><span class="cx"> $cat_array = array();
</span><span class="cx"> if( ! is_array( $excluded_categories ) )
</span><span class="cx"> $excluded_categories = explode( ',', $excluded_categories );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $in_same_cat || ! empty( $excluded_categories ) ) {
</span><span class="cx"> if ( $in_same_cat )
</span><span class="cx"> $cat_array = wp_get_object_terms( $post->ID, 'category', array( 'fields' => 'ids' ) );
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/meta.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -307,7 +307,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.
</ins><span class="cx"> * @return boolean true of the key is set, false if not.
</span><span class="cx"> */
</span><span class="cx"> function metadata_exists( $meta_type, $object_id, $meta_key ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/post.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1040,7 +1040,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'registered_post_type', $post_type, $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $args;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5308,7 +5308,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> * @param string $new_status
</span><span class="cx"> * @param string $old_status
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/taxonomy.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -2854,7 +2854,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $object_types = (array) $taxonomy->object_type;
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $object_types as &$object_type )
</span><span class="cx"> list( $object_type ) = explode( ':', $object_type );
</span><span class="cx">
</span><span class="lines">@@ -2878,7 +2878,7 @@
</span><span class="cx"> if ( $object_types )
</span><span class="cx"> $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'edit_term_taxonomy', $term, $taxonomy );
</span><span class="cx"> $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
</span><span class="cx"> do_action( 'edited_term_taxonomy', $term, $taxonomy );
</span></span></pre></div>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/update.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
</span><span class="cx">
</span><span class="cx"> $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> return array( 'counts' => $counts, 'title' => $update_title );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (19053 => 19054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2011-10-24 19:10:56 UTC (rev 19053)
+++ trunk/wp-includes/widgets.php 2011-10-24 19:13:23 UTC (rev 19054)
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 3.3
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function _wp_sidebars_changed() {
</span><span class="cx"> global $sidebars_widgets;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>