<!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>[22634] 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/22634">22634</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-17 15:11:29 +0000 (Sat, 17 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadmincsswpadminrtlcss">trunk/wp-admin/css/wp-admin-rtl.css</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadmincustomizephp">trunk/wp-admin/customize.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescategoryphp">trunk/wp-includes/category.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizesettingphp">trunk/wp-includes/class-wp-customize-setting.php</a></li>
<li><a href="#trunkwpincludescssadminbarcss">trunk/wp-includes/css/admin-bar.css</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="#trunkwpincludesjsadminbarjs">trunk/wp-includes/js/admin-bar.js</a></li>
<li><a href="#trunkwpincludesjscolorpickerjs">trunk/wp-includes/js/colorpicker.js</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludestemplatephp">trunk/wp-includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-activate.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Confirms that the activation key that is sent in an email after a user signs
</span><span class="cx"> * up for a new blog matches the key for that user and then displays confirmation.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds an action hook specific to this page that fires on wp_head
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since MU
</span><span class="cx"> */
</span><span class="cx"> function do_activate_header() {
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Loads styles specific to this page.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since MU
</span><span class="cx"> */
</span><span class="cx"> function wpmu_activate_stylesheet() {
</span></span></pre></div>
<a id="trunkwpadmincsswpadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.css (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.css 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/css/wp-admin-rtl.css 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> margin-left: 15px;
</span><span class="cx"> margin-right: 52px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .auto-fold #adminmenu div.wp-menu-image {
</span><span class="cx"> float: right;
</span><span class="cx"> width: 30px;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/css/wp-admin.css 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -8380,12 +8380,12 @@
</span><span class="cx"> background: url('../images/stars-2x.png?ver=20121108') repeat-x top left;
</span><span class="cx"> background-size: 21px 37px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .welcome-panel .welcome-panel-close:before {
</span><span class="cx"> background-image: url('../images/xit-2x.gif');
</span><span class="cx"> background-size: 20px auto;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .welcome-panel .welcome-add-page {
</span><span class="cx"> background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
</span><span class="cx"> background-size: 16px;
</span><span class="lines">@@ -8420,7 +8420,7 @@
</span><span class="cx"> background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px;
</span><span class="cx"> background-size: 16px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .login h1 a {
</span><span class="cx"> background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
</span><span class="cx"> background-size: 274px 63px;
</span><span class="lines">@@ -8430,16 +8430,16 @@
</span><span class="cx"> background-image: url('../images/wp-badge-2x.png?ver=20120516');
</span><span class="cx"> background-size: 173px 194px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .wp-full-overlay .collapse-sidebar-arrow {
</span><span class="cx"> background-image: url('../images/arrows-2x.png');
</span><span class="cx"> background-size: 15px 123px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .pressthis a span {
</span><span class="cx"> background-image: url(../images/press-this-2x.png?v=20121105);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .imgedit-crop,
</span><span class="cx"> .imgedit-rleft,
</span><span class="cx"> .imgedit-rright,
</span><span class="lines">@@ -8450,7 +8450,7 @@
</span><span class="cx"> background-image: url('../images/imgedit-icons-2x.png');
</span><span class="cx"> background-size: 260px 64px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .spinner,
</span><span class="cx"> .imgedit-wait,
</span><span class="cx"> .customize-loading #customize-container {
</span></span></pre></div>
<a id="trunkwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/customize.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/customize.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/customize.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <body class="<?php echo esc_attr( $body_class ); ?>">
</span><span class="cx"> <div class="wp-full-overlay expanded">
</span><span class="cx"> <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="customize-header-actions" class="wp-full-overlay-header">
</span><span class="cx"> <?php
</span><span class="cx"> $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <?php _e( 'Cancel' ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> $screenshot = $wp_customize->theme()->get_screenshot();
</span><span class="cx"> $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/install.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> wp_admin_css( 'install', true );
</span><span class="cx"> ?>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/menu-header.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> if ( ! empty( $submenu_items ) ) {
</span><span class="cx"> echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
</span><span class="cx"> echo "<li class='wp-submenu-head'>{$item[0]}</li>";
</span><del>-
</del><ins>+
</ins><span class="cx"> $first = true;
</span><span class="cx"> foreach ( $submenu_items as $sub_key => $sub_item ) {
</span><span class="cx"> if ( ! current_user_can( $sub_item[1] ) )
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-admin/plugin-install.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> 'content' =>
</span><span class="cx"> '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
</span><del>- '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
</del><ins>+ '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
</ins><span class="cx"> '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/cache.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -629,8 +629,8 @@
</span><span class="cx">
</span><span class="cx"> $this->multisite = is_multisite();
</span><span class="cx"> $this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @todo This should be moved to the PHP4 style constructor, PHP5
</span><span class="cx"> * already calls __destruct()
</span></span></pre></div>
<a id="trunkwpincludescategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/category.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span><del>- * @param string $cat_name Category name.
</del><ins>+ * @param string $cat_name Category name.
</ins><span class="cx"> * @return int 0, if failure and ID of category on success.
</span><span class="cx"> */
</span><span class="cx"> function get_cat_ID( $cat_name ) {
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/class-wp-customize-manager.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $ajax_message AJAX return
</span><del>- * @param mixed $message UI message
</del><ins>+ * @param mixed $message UI message
</ins><span class="cx"> */
</span><span class="cx"> protected function wp_die( $ajax_message, $message = null ) {
</span><span class="cx"> if ( $this->doing_ajax() )
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> return '_default_wp_die_handler';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Start preview and customize theme.
</span><span class="cx"> *
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> $this->start_previewing_theme();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Callback to validate a theme once it is loaded
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizesettingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-setting.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-setting.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/class-wp-customize-setting.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Customize_Filter_Setting extends WP_Customize_Setting {
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludescssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.css (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.css 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/css/admin-bar.css 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> background-image: url(../images/admin-bar-sprite-2x.png?d=20120830);
</span><span class="cx"> background-size: 20px 220px;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> #wpadminbar .quicklinks li div.blavatar {
</span><span class="cx"> background: url('../images/wpmini-blue-2x.png') no-repeat;
</span><span class="cx"> background-size: 16px 16px;
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/functions.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -2129,7 +2129,7 @@
</span><span class="cx"> .button {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> text-decoration: none;
</span><del>- font-size: 14px;
</del><ins>+ font-size: 14px;
</ins><span class="cx"> line-height: 23px;
</span><span class="cx"> height: 24px;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -2153,7 +2153,7 @@
</span><span class="cx"> color: #333;
</span><span class="cx"> text-shadow: 0 1px 0 #fff;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .button.button-large {
</span><span class="cx"> height: 29px;
</span><span class="cx"> line-height: 28px;
</span><span class="lines">@@ -2172,7 +2172,7 @@
</span><span class="cx"> border-color: #999;
</span><span class="cx"> color: #222;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .button:focus {
</span><span class="cx"> -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
</span><span class="cx"> box-shadow: 1px 1px 1px rgba(0,0,0,.2);
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/general-template.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -1631,8 +1631,8 @@
</span><span class="cx"> 'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
</span><span class="cx"> /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
</span><span class="cx"> 'searchtitle' => __('%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed'),
</span><del>- /* translators: 1: blog name, 2: separator(raquo), 3: post type name */
- 'posttypetitle' => __('%1$s %2$s %3$s Feed'),
</del><ins>+ /* translators: 1: blog name, 2: separator(raquo), 3: post type name */
+ 'posttypetitle' => __('%1$s %2$s %3$s Feed'),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -1663,10 +1663,10 @@
</span><span class="cx"> } elseif ( is_search() ) {
</span><span class="cx"> $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
</span><span class="cx"> $href = get_search_feed_link();
</span><del>- } elseif ( is_post_type_archive() ) {
- $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
- $href = get_post_type_archive_feed_link( get_queried_object()->name );
- }
</del><ins>+ } elseif ( is_post_type_archive() ) {
+ $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+ $href = get_post_type_archive_feed_link( get_queried_object()->name );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( isset($title) && isset($href) )
</span><span class="cx"> echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
</span></span></pre></div>
<a id="trunkwpincludesjsadminbarjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/admin-bar.js (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/admin-bar.js 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/js/admin-bar.js 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> adminbar.removeClass('nojq').removeClass('nojs');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device
</span><span class="cx"> // close any open drop-downs when the click/touch is not on the toolbar
</span><span class="cx"> $(document.body).on('click.wp-mobile-hover', function(e) {
</span></span></pre></div>
<a id="trunkwpincludesjscolorpickerjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/colorpicker.js (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/colorpicker.js 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/js/colorpicker.js 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> // use. That means, you can include it in your product, or your web
</span><span class="cx"> // site, or any other form where the code is actually being used. You
</span><span class="cx"> // may not put the plain javascript up on your site for download or
</span><del>-// include it in your javascript libraries for download.
</del><ins>+// include it in your javascript libraries for download.
</ins><span class="cx"> // If you wish to share this code with others, please just point them
</span><span class="cx"> // to the URL instead.
</span><span class="cx"> // Please DO NOT link directly to my .js files from your site. Copy
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> /* SOURCE FILE: AnchorPosition.js */
</span><span class="cx">
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> AnchorPosition.js
</span><span class="cx"> Author: Matt Kruse
</span><span class="cx"> Last modified: 10/11/02
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> so other elements can be positioned relative to it.
</span><span class="cx">
</span><span class="cx"> COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
</span><del>-positioning errors - usually with Window positioning - occur on the
</del><ins>+positioning errors - usually with Window positioning - occur on the
</ins><span class="cx"> Macintosh platform.
</span><span class="cx">
</span><span class="cx"> FUNCTIONS:
</span><span class="lines">@@ -44,16 +44,16 @@
</span><span class="cx">
</span><span class="cx"> NOTES:
</span><span class="cx">
</span><del>-1) For popping up separate browser windows, use getAnchorWindowPosition.
</del><ins>+1) For popping up separate browser windows, use getAnchorWindowPosition.
</ins><span class="cx"> Otherwise, use getAnchorPosition
</span><span class="cx">
</span><del>-2) Your anchor tag MUST contain both NAME and ID attributes which are the
</del><ins>+2) Your anchor tag MUST contain both NAME and ID attributes which are the
</ins><span class="cx"> same. For example:
</span><span class="cx"> <A NAME="test" ID="test"> </A>
</span><span class="cx">
</span><del>-3) There must be at least a space between <A> </A> for IE5.5 to see the
</del><ins>+3) There must be at least a space between <A> </A> for IE5.5 to see the
</ins><span class="cx"> anchor tag correctly. Do not do <A></A> with no space.
</span><del>-*/
</del><ins>+*/
</ins><span class="cx">
</span><span class="cx"> // getAnchorPosition(anchorname)
</span><span class="cx"> // This function returns an object having .x and .y properties which are the coordinates
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> /* SOURCE FILE: PopupWindow.js */
</span><span class="cx">
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> PopupWindow.js
</span><span class="cx"> Author: Matt Kruse
</span><span class="cx"> Last modified: 02/16/04
</span><span class="lines">@@ -161,20 +161,20 @@
</span><span class="cx"> window.
</span><span class="cx">
</span><span class="cx"> COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
</span><del>-positioning errors - usually with Window positioning - occur on the
-Macintosh platform. Due to bugs in Netscape 4.x, populating the popup
</del><ins>+positioning errors - usually with Window positioning - occur on the
+Macintosh platform. Due to bugs in Netscape 4.x, populating the popup
</ins><span class="cx"> window with <STYLE> tags may cause errors.
</span><span class="cx">
</span><span class="cx"> USAGE:
</span><span class="cx"> // Create an object for a WINDOW popup
</span><del>-var win = new PopupWindow();
</del><ins>+var win = new PopupWindow();
</ins><span class="cx">
</span><span class="cx"> // Create an object for a DIV window using the DIV named 'mydiv'
</span><del>-var win = new PopupWindow('mydiv');
</del><ins>+var win = new PopupWindow('mydiv');
</ins><span class="cx">
</span><del>-// Set the window to automatically hide itself when the user clicks
</del><ins>+// Set the window to automatically hide itself when the user clicks
</ins><span class="cx"> // anywhere else on the page except the popup
</span><del>-win.autoHide();
</del><ins>+win.autoHide();
</ins><span class="cx">
</span><span class="cx"> // Show the window relative to the anchor name passed in
</span><span class="cx"> win.showPopup(anchorname);
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> // Set the size of the popup window (only applies to WINDOW popups
</span><span class="cx"> win.setSize(width,height);
</span><span class="cx">
</span><del>-// Populate the contents of the popup window that will be shown. If you
</del><ins>+// Populate the contents of the popup window that will be shown. If you
</ins><span class="cx"> // change the contents while it is displayed, you will need to refresh()
</span><span class="cx"> win.populate(string);
</span><span class="cx">
</span><span class="lines">@@ -205,18 +205,18 @@
</span><span class="cx"> NOTES:
</span><span class="cx"> 1) Requires the functions in AnchorPosition.js
</span><span class="cx">
</span><del>-2) Your anchor tag MUST contain both NAME and ID attributes which are the
</del><ins>+2) Your anchor tag MUST contain both NAME and ID attributes which are the
</ins><span class="cx"> same. For example:
</span><span class="cx"> <A NAME="test" ID="test"> </A>
</span><span class="cx">
</span><del>-3) There must be at least a space between <A> </A> for IE5.5 to see the
</del><ins>+3) There must be at least a space between <A> </A> for IE5.5 to see the
</ins><span class="cx"> anchor tag correctly. Do not do <A></A> with no space.
</span><span class="cx">
</span><span class="cx"> 4) When a PopupWindow object is created, a handler for 'onmouseup' is
</span><span class="cx"> attached to any event handler you may have already defined. Do NOT define
</span><span class="cx"> an event handler for 'onmouseup' after you define a PopupWindow object or
</span><span class="cx"> the autoHide() will not work correctly.
</span><del>-*/
</del><ins>+*/
</ins><span class="cx">
</span><span class="cx"> // Set the position of the popup window based on the anchor
</span><span class="cx"> function PopupWindow_getXYPosition(anchorname) {
</span><span class="lines">@@ -255,11 +255,11 @@
</span><span class="cx"> if (this.use_gebi) {
</span><span class="cx"> document.getElementById(this.divName).innerHTML = this.contents;
</span><span class="cx"> }
</span><del>- else if (this.use_css) {
</del><ins>+ else if (this.use_css) {
</ins><span class="cx"> document.all[this.divName].innerHTML = this.contents;
</span><span class="cx"> }
</span><del>- else if (this.use_layers) {
- var d = document.layers[this.divName];
</del><ins>+ else if (this.use_layers) {
+ var d = document.layers[this.divName];
</ins><span class="cx"> d.document.open();
</span><span class="cx"> d.document.writeln(this.contents);
</span><span class="cx"> d.document.close();
</span><span class="lines">@@ -470,11 +470,11 @@
</span><span class="cx">
</span><span class="cx"> /* SOURCE FILE: ColorPicker2.js */
</span><span class="cx">
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> Last modified: 02/24/2003
</span><span class="cx">
</span><del>-DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB
-form. It uses a color "swatch" to display the standard 216-color web-safe
</del><ins>+DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB
+form. It uses a color "swatch" to display the standard 216-color web-safe
</ins><span class="cx"> palette. The user can then click on a color to select it.
</span><span class="cx">
</span><span class="cx"> COMPATABILITY: See notes in AnchorPosition.js and PopupWindow.js.
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx">
</span><span class="cx"> // Write the 'pickColor' function that will be called when the user clicks
</span><span class="cx"> // a color and do something with the value. This is only required if you
</span><del>-// want to do something other than simply populate a form field, which is
</del><ins>+// want to do something other than simply populate a form field, which is
</ins><span class="cx"> // what the 'select' function will give you.
</span><span class="cx"> function pickColor(color) {
</span><span class="cx"> field.value = color;
</span><span class="lines">@@ -509,18 +509,18 @@
</span><span class="cx"> NOTES:
</span><span class="cx"> 1) Requires the functions in AnchorPosition.js and PopupWindow.js
</span><span class="cx">
</span><del>-2) Your anchor tag MUST contain both NAME and ID attributes which are the
</del><ins>+2) Your anchor tag MUST contain both NAME and ID attributes which are the
</ins><span class="cx"> same. For example:
</span><span class="cx"> <A NAME="test" ID="test"> </A>
</span><span class="cx">
</span><del>-3) There must be at least a space between <A> </A> for IE5.5 to see the
</del><ins>+3) There must be at least a space between <A> </A> for IE5.5 to see the
</ins><span class="cx"> anchor tag correctly. Do not do <A></A> with no space.
</span><span class="cx">
</span><span class="cx"> 4) When a ColorPicker object is created, a handler for 'onmouseup' is
</span><span class="cx"> attached to any event handler you may have already defined. Do NOT define
</span><span class="cx"> an event handler for 'onmouseup' after you define a ColorPicker object or
</span><span class="cx"> the color picker will not hide itself correctly.
</span><del>-*/
</del><ins>+*/
</ins><span class="cx"> ColorPicker_targetInput = null;
</span><span class="cx"> function ColorPicker_writeDiv() {
</span><span class="cx"> document.writeln("<DIV ID=\"colorPickerDiv\" STYLE=\"position:absolute;visibility:hidden;\"> </DIV>");
</span><span class="lines">@@ -548,8 +548,8 @@
</span><span class="cx"> // This function is the easiest way to popup the window, select a color, and
</span><span class="cx"> // have the value populate a form field, which is what most people want to do.
</span><span class="cx"> function ColorPicker_select(inputobj,linkname) {
</span><del>- if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
- alert("colorpicker.select: Input object passed is not a valid form input object");
</del><ins>+ if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
+ alert("colorpicker.select: Input object passed is not a valid form input object");
</ins><span class="cx"> window.ColorPicker_targetInput=null;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> if (use_highlight) { var mo = 'onMouseOver="'+windowRef+'ColorPicker_highlightColor(\''+colors[i]+'\',window.document)"'; }
</span><span class="cx"> else { mo = ""; }
</span><span class="cx"> cp_contents += '<td style="background-color: '+colors[i]+';"><a href="javascript:void()" onclick="'+windowRef+'ColorPicker_pickColor(\''+colors[i]+'\','+windowRef+'window.popupWindowObjects['+cp.index+']);return false;" '+mo+'>&nbsp;</a></td>';
</span><del>- if ( ((i+1)>=total) || (((i+1) % width) == 0)) {
</del><ins>+ if ( ((i+1)>=total) || (((i+1) % width) == 0)) {
</ins><span class="cx"> cp_contents += "</tr>";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/ms-blogs.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -327,8 +327,8 @@
</span><span class="cx"> do_action( 'make_delete_blog', $blog_id );
</span><span class="cx"> else
</span><span class="cx"> do_action( 'make_undelete_blog', $blog_id );
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> if ( isset( $details[ 'public' ] ) ) {
</span><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx"> update_option( 'blog_public', $details[ 'public' ] );
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> $global_groups = $wp_object_cache->global_groups;
</span><span class="cx"> else
</span><span class="cx"> $global_groups = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_cache_init();
</span><span class="cx">
</span><span class="cx"> if ( function_exists( 'wp_cache_add_global_groups' ) ) {
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> $global_groups = $wp_object_cache->global_groups;
</span><span class="cx"> else
</span><span class="cx"> $global_groups = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_cache_init();
</span><span class="cx">
</span><span class="cx"> if ( function_exists( 'wp_cache_add_global_groups' ) ) {
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/post-template.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> $classes[] = 'single-format-' . sanitize_html_class( $post_format );
</span><span class="cx"> else
</span><span class="cx"> $classes[] = 'single-format-standard';
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( is_attachment() ) {
</span><span class="lines">@@ -459,21 +459,21 @@
</span><span class="cx"> $classes[] = 'author';
</span><span class="cx"> if ( isset( $author->user_nicename ) ) {
</span><span class="cx"> $classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
</span><del>- $classes[] = 'author-' . $author->ID;
</del><ins>+ $classes[] = 'author-' . $author->ID;
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( is_category() ) {
</span><span class="cx"> $cat = $wp_query->get_queried_object();
</span><span class="cx"> $classes[] = 'category';
</span><span class="cx"> if ( isset( $cat->term_id ) ) {
</span><span class="cx"> $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
</span><del>- $classes[] = 'category-' . $cat->term_id;
</del><ins>+ $classes[] = 'category-' . $cat->term_id;
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( is_tag() ) {
</span><span class="cx"> $tags = $wp_query->get_queried_object();
</span><span class="cx"> $classes[] = 'tag';
</span><span class="cx"> if ( isset( $tags->term_id ) ) {
</span><span class="cx"> $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
</span><del>- $classes[] = 'tag-' . $tags->term_id;
</del><ins>+ $classes[] = 'tag-' . $tags->term_id;
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( is_tax() ) {
</span><span class="cx"> $term = $wp_query->get_queried_object();
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/query.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -2774,13 +2774,13 @@
</span><span class="cx"> // of the type WP_Post and are filtered.
</span><span class="cx"> if ( $this->posts ) {
</span><span class="cx"> $this->post_count = count( $this->posts );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->posts = array_map( 'get_post', $this->posts );
</span><span class="cx">
</span><span class="cx"> if ( $q['cache_results'] )
</span><span class="cx"> update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
</span><span class="cx">
</span><del>- $this->post = reset( $this->posts );
</del><ins>+ $this->post = reset( $this->posts );
</ins><span class="cx"> } else {
</span><span class="cx"> $this->post_count = 0;
</span><span class="cx"> $this->posts = array();
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/taxonomy.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx">
</span><del>- if ( strlen( $taxonomy ) > 32 )
</del><ins>+ if ( strlen( $taxonomy ) > 32 )
</ins><span class="cx"> return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
</span><span class="cx">
</span><span class="cx"> if ( false !== $args['query_var'] && !empty($wp) ) {
</span></span></pre></div>
<a id="trunkwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/template.php (22633 => 22634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/template.php 2012-11-17 13:20:57 UTC (rev 22633)
+++ trunk/wp-includes/template.php 2012-11-17 15:11:29 UTC (rev 22634)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> function get_attachment_template() {
</span><span class="cx"> global $posts;
</span><span class="cx">
</span><del>- if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
</del><ins>+ if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
</ins><span class="cx"> $type = explode( '/', $posts[0]->post_mime_type );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $type ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>