<!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>[22778] trunk/wp-admin: Remove legacy media uploader bits from custom-header.php and custom-background.php.</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/22778">22778</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-21 17:44:49 +0000 (Wed, 21 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove legacy media uploader bits from custom-header.php and custom-background.php. see <a href="http://core.trac.wordpress.org/ticket/22186">#22186</a>, <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</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 (22777 => 22778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php        2012-11-21 17:40:53 UTC (rev 22777)
+++ trunk/wp-admin/custom-background.php        2012-11-21 17:44:49 UTC (rev 22778)
</span><span class="lines">@@ -73,12 +73,6 @@
</span><span class="cx">                 add_action(&quot;load-$page&quot;, array(&amp;$this, 'take_action'), 49);
</span><span class="cx">                 add_action(&quot;load-$page&quot;, array(&amp;$this, 'handle_upload'), 49);
</span><span class="cx"> 
</span><del>-                if ( isset( $_REQUEST['context'] ) &amp;&amp; $_REQUEST['context'] == 'custom-background' ) {
-                        add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
-                        add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
-                        add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
-                }
-
</del><span class="cx">                 if ( $this-&gt;admin_header_callback )
</span><span class="cx">                         add_action(&quot;admin_head-$page&quot;, $this-&gt;admin_header_callback, 51);
</span><span class="cx">         }
</span><span class="lines">@@ -105,7 +99,6 @@
</span><span class="cx">                         '&lt;p&gt;' . __( '&lt;a href=&quot;http://wordpress.org/support/&quot; target=&quot;_blank&quot;&gt;Support Forums&lt;/a&gt;' ) . '&lt;/p&gt;'
</span><span class="cx">                 );
</span><span class="cx"> 
</span><del>-                add_thickbox();
</del><span class="cx">                 wp_enqueue_media();
</span><span class="cx">                 wp_enqueue_script('custom-background');
</span><span class="cx">                 wp_enqueue_style('wp-color-picker');
</span><span class="lines">@@ -397,25 +390,21 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><del>-         * Replace default attachment actions with &quot;Set as background&quot; link.
</del><ins>+         * Unused since 3.5.0.
</ins><span class="cx">          *
</span><span class="cx">          * @since 3.4.0
</span><span class="cx">          */
</span><del>-        function attachment_fields_to_edit( $form_fields, $post ) {
-                $form_fields = array( 'image-size' =&gt; $form_fields['image-size'] );
-                $form_fields['buttons'] = array( 'tr' =&gt; '&lt;tr class=&quot;submit&quot;&gt;&lt;td&gt;&lt;/td&gt;&lt;td&gt;&lt;a data-attachment-id=&quot;' . $post-&gt;ID . '&quot; class=&quot;wp-set-background&quot;&gt;' . __( 'Set as background' ) . '&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;' );
-                $form_fields['context'] = array( 'input' =&gt; 'hidden', 'value' =&gt; 'custom-background' );
-
</del><ins>+        function attachment_fields_to_edit( $form_fields ) {
</ins><span class="cx">                 return $form_fields;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><del>-         * Leave only &quot;Media Library&quot; tab in the uploader window.
</del><ins>+         * Unused since 3.5.0.
</ins><span class="cx">          *
</span><span class="cx">          * @since 3.4.0
</span><span class="cx">          */
</span><del>-        function filter_upload_tabs() {
-                return array( 'library' =&gt; __('Media Library') );
</del><ins>+        function filter_upload_tabs( $tabs ) {
+                return $tabs;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         public function wp_set_background_image() {
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (22777 => 22778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php        2012-11-21 17:40:53 UTC (rev 22777)
+++ trunk/wp-admin/custom-header.php        2012-11-21 17:44:49 UTC (rev 22778)
</span><span class="lines">@@ -93,12 +93,6 @@
</span><span class="cx">                 add_action(&quot;admin_head-$page&quot;, array(&amp;$this, 'js'), 50);
</span><span class="cx">                 if ( $this-&gt;admin_header_callback )
</span><span class="cx">                         add_action(&quot;admin_head-$page&quot;, $this-&gt;admin_header_callback, 51);
</span><del>-
-                if ( isset( $_REQUEST['context'] ) &amp;&amp; $_REQUEST['context'] == 'custom-header' ) {
-                        add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
-                        add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
-                        add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
-                }
</del><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><span class="lines">@@ -171,7 +165,6 @@
</span><span class="cx">                 $step = $this-&gt;step();
</span><span class="cx"> 
</span><span class="cx">                 if ( ( 1 == $step || 3 == $step ) ) {
</span><del>-                        add_thickbox();
</del><span class="cx">                         wp_enqueue_media();
</span><span class="cx">                         wp_enqueue_script( 'custom-header' );
</span><span class="cx">                         if ( current_theme_supports( 'custom-header', 'header-text' ) )
</span><span class="lines">@@ -910,32 +903,21 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><del>-         * Replace default attachment actions with &quot;Set as header&quot; link.
</del><ins>+         * Unused since 3.5.0.
</ins><span class="cx">          *
</span><span class="cx">          * @since 3.4.0
</span><span class="cx">          */
</span><del>-        function attachment_fields_to_edit( $form_fields, $post ) {
-                $form_fields = array();
-                $href = esc_url(add_query_arg(array(
-                        'page' =&gt; 'custom-header',
-                        'step' =&gt; 2,
-                        '_wpnonce-custom-header-upload' =&gt; wp_create_nonce('custom-header-upload'),
-                        'file' =&gt; $post-&gt;ID
-                ), admin_url('themes.php')));
-
-                $form_fields['buttons'] = array( 'tr' =&gt; '&lt;tr class=&quot;submit&quot;&gt;&lt;td&gt;&lt;/td&gt;&lt;td&gt;&lt;a data-location=&quot;' . $href . '&quot; class=&quot;wp-set-header&quot;&gt;' . __( 'Set as header' ) . '&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;' );
-                $form_fields['context'] = array( 'input' =&gt; 'hidden', 'value' =&gt; 'custom-header' );
-
</del><ins>+        function attachment_fields_to_edit( $form_fields ) {
</ins><span class="cx">                 return $form_fields;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><del>-         * Leave only &quot;Media Library&quot; tab in the uploader window.
</del><ins>+         * Unused since 3.5.0.
</ins><span class="cx">          *
</span><span class="cx">          * @since 3.4.0
</span><span class="cx">          */
</span><del>-        function filter_upload_tabs() {
-                return array( 'library' =&gt; __('Media Library') );
</del><ins>+        function filter_upload_tabs( $tabs ) {
+                return $tabs;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span></span></pre>
</div>
</div>

</body>
</html>