<!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>[21070] 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/21070">21070</a></dd>

<dt>Author</dt> <dd>ryan</dd>

<dt>Date</dt> <dd>2012-06-12 19:27:41 +0000 (Tue, 12 Jun 2012)</dd>

</dl>

<h3>Log Message</h3>

<pre>Pinking shears</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>

<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>

<li><a href="#trunkwpincludesjsquicktagsdevjs">trunk/wp-includes/js/quicktags.dev.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadmincustombackgroundphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (21069 => 21070)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/custom-background.php        2012-06-12 18:39:16 UTC (rev 21069)

+++ trunk/wp-admin/custom-background.php        2012-06-12 19:27:41 UTC (rev 21070)

</span><span class="lines">@@ -238,7 +238,7 @@

</span><span class="cx"> &lt;/tr&gt;

</span><span class="cx"> &lt;?php endif; ?&gt;

</span><span class="cx"> 

</span><del>-&lt;?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?&gt; 

</del><ins>+&lt;?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?&gt;

</ins><span class="cx"> &lt;?php if ( $default_image &amp;&amp; get_background_image() != $default_image ) : ?&gt;

</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;

</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;?php _e('Restore Original Image'); ?&gt;&lt;/th&gt;

</span></span></pre></div>

<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (21069 => 21070)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php        2012-06-12 18:39:16 UTC (rev 21069)

+++ trunk/wp-includes/class-wp-customize-manager.php        2012-06-12 19:27:41 UTC (rev 21070)

</span><span class="lines">@@ -160,11 +160,11 @@

</span><span class="cx">                         add_filter( 'template', array( $this, 'get_template' ) );

</span><span class="cx">                         add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );

</span><span class="cx">                         add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );

</span><del>-        

</del><ins>+

</ins><span class="cx">                         // @link: http://core.trac.wordpress.org/ticket/20027

</span><span class="cx">                         add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );

</span><span class="cx">                         add_filter( 'pre_option_template', array( $this, 'get_template' ) );

</span><del>-        

</del><ins>+

</ins><span class="cx">                         // Handle custom theme roots.

</span><span class="cx">                         add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );

</span><span class="cx">                         add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );

</span><span class="lines">@@ -190,11 +190,11 @@

</span><span class="cx">                         remove_filter( 'template', array( $this, 'get_template' ) );

</span><span class="cx">                         remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );

</span><span class="cx">                         remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );

</span><del>-        

</del><ins>+

</ins><span class="cx">                         // @link: http://core.trac.wordpress.org/ticket/20027

</span><span class="cx">                         remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );

</span><span class="cx">                         remove_filter( 'pre_option_template', array( $this, 'get_template' ) );

</span><del>-        

</del><ins>+

</ins><span class="cx">                         // Handle custom theme roots.

</span><span class="cx">                         remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );

</span><span class="cx">                         remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );

</span></span></pre></div>

<a id="trunkwpincludesjsquicktagsdevjs"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.dev.js (21069 => 21070)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/js/quicktags.dev.js        2012-06-12 18:39:16 UTC (rev 21069)

+++ trunk/wp-includes/js/quicktags.dev.js        2012-06-12 19:27:41 UTC (rev 21070)

</span><span class="lines">@@ -1,6 +1,6 @@

</span><span class="cx"> /*

</span><span class="cx">  * Quicktags

</span><del>- * 

</del><ins>+ *

</ins><span class="cx">  * This is the HTML editor in WordPress. It can be attached to any textarea and will

<span class="cx">  * append a toolbar above it. This script is self-contained (does not require external libraries).

</span><span class="cx">  *

</span><span class="lines">@@ -51,7 +51,7 @@

</span><span class="cx"> 

</span><span class="cx"> /**

</span><span class="cx">  * Inserts content at the caret in the active editor (textarea)

</span><del>- * 

</del><ins>+ *

</ins><span class="cx">  * Added for back compatibility

</span><span class="cx">  * @see QTags.insertContent()

</span><span class="cx">  */

</span><span class="lines">@@ -61,12 +61,12 @@

</span><span class="cx"> 

</span><span class="cx"> /**

</span><span class="cx">  * Adds a button to all instances of the editor

</span><del>- * 

</del><ins>+ *

</ins><span class="cx">  * Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc.

</span><span class="cx">  * @see QTags.addButton()

</span><span class="cx">  */

</span><span class="cx"> function edButton(id, display, tagStart, tagEnd, access, open) {

</span><del>-        return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );        

</del><ins>+        return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> (function(){

</span><span class="lines">@@ -278,7 +278,7 @@

</span><span class="cx"> 

</span><span class="cx">         /**

</span><span class="cx">          * Main API function for adding a button to Quicktags

</span><del>-         * 

</del><ins>+         *

</ins><span class="cx">          * Adds qt.Button or qt.TagButton depending on the args. The first three args are always required.

</span><span class="cx">          * To be able to add button(s) to Quicktags, your script should be enqueued as dependent

</span><span class="cx">          * on &quot;quicktags&quot; and outputted in the footer. If you are echoing JS directly from PHP,

</span><span class="lines">@@ -297,14 +297,14 @@

<span class="cx">          * @param arg1 string || function required Either a starting tag to be inserted like &quot;&lt;span&gt;&quot; or a callback that is executed when the button is clicked.

</span><span class="cx">          * @param arg2 string optional Ending tag like &quot;&lt;/span&gt;&quot;

<span class="cx">          * @param access_key string optional Access key for the button.

</span><del>-         * @param title string optional Button's title=&quot;...&quot; 

</del><ins>+         * @param title string optional Button's title=&quot;...&quot;

</ins><span class="cx">          * @param priority int optional Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.

<span class="cx">          * @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present.

<span class="cx">          * @return mixed null or the button object that is needed for back-compat.

</span><del>-         */                                   

</del><ins>+         */

</ins><span class="cx">         qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {

</span><span class="cx">                 var btn;

</span><del>-                

</del><ins>+

</ins><span class="cx">                 if ( !id || !display )

</span><span class="cx">                         return;

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>