<!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>[21009] trunk/wp-admin: Check context before adding media upload filters.</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/21009">21009</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-06 16:48:53 +0000 (Wed, 06 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check context before adding media upload filters. Props SergeyBiryukov. fixes <a href="http://core.trac.wordpress.org/ticket/20819">#20819</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 (21008 => 21009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2012-06-06 16:00:08 UTC (rev 21008)
+++ trunk/wp-admin/custom-background.php 2012-06-06 16:48:53 UTC (rev 21009)
</span><span class="lines">@@ -72,9 +72,13 @@
</span><span class="cx"> add_action("load-$page", array(&$this, 'admin_load'));
</span><span class="cx"> add_action("load-$page", array(&$this, 'take_action'), 49);
</span><span class="cx"> add_action("load-$page", array(&$this, 'handle_upload'), 49);
</span><del>- add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
- add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
</del><span class="cx">
</span><ins>+ if ( isset( $_REQUEST['context'] ) && $_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' );
+ }
+
</ins><span class="cx"> if ( $this->admin_header_callback )
</span><span class="cx"> add_action("admin_head-$page", $this->admin_header_callback, 51);
</span><span class="cx"> }
</span><span class="lines">@@ -388,21 +392,26 @@
</span><span class="cx"> $this->updated = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Replace default attachment actions with "Set as background" link.
+ *
+ * @since 3.4.0
+ */
</ins><span class="cx"> function attachment_fields_to_edit( $form_fields, $post ) {
</span><del>- if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' ) {
- $form_fields = array( 'image-size' => $form_fields['image-size'] );
- $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-attachment-id="' . $post->ID . '" class="wp-set-background">' . __( 'Set as background' ) . '</a></td></tr>' );
- $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-background' );
- }
</del><ins>+ $form_fields = array( 'image-size' => $form_fields['image-size'] );
+ $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-attachment-id="' . $post->ID . '" class="wp-set-background">' . __( 'Set as background' ) . '</a></td></tr>' );
+ $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-background' );
</ins><span class="cx">
</span><span class="cx"> return $form_fields;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function filter_upload_tabs ( $tabs ){
- if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' )
- return array( 'library' => __('Media Library') );
-
- return $tabs;
</del><ins>+ /**
+ * Leave only "Media Library" tab in the uploader window.
+ *
+ * @since 3.4.0
+ */
+ function filter_upload_tabs() {
+ return array( 'library' => __('Media Library') );
</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 (21008 => 21009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-06-06 16:00:08 UTC (rev 21008)
+++ trunk/wp-admin/custom-header.php 2012-06-06 16:48:53 UTC (rev 21009)
</span><span class="lines">@@ -94,9 +94,11 @@
</span><span class="cx"> if ( $this->admin_header_callback )
</span><span class="cx"> add_action("admin_head-$page", $this->admin_header_callback, 51);
</span><span class="cx">
</span><del>- 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><ins>+ if ( isset( $_REQUEST['context'] ) && $_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' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -972,18 +974,16 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> function attachment_fields_to_edit( $form_fields, $post ) {
</span><del>- if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) {
- $form_fields = array();
- $href = esc_url(add_query_arg(array(
- 'page' => 'custom-header',
- 'step' => 2,
- '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
- 'file' => $post->ID
- ), admin_url('themes.php')));
</del><ins>+ $form_fields = array();
+ $href = esc_url(add_query_arg(array(
+ 'page' => 'custom-header',
+ 'step' => 2,
+ '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
+ 'file' => $post->ID
+ ), admin_url('themes.php')));
</ins><span class="cx">
</span><del>- $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-location="' . $href . '" class="wp-set-header">' . __( 'Set as header' ) . '</a></td></tr>' );
- $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
- }
</del><ins>+ $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-location="' . $href . '" class="wp-set-header">' . __( 'Set as header' ) . '</a></td></tr>' );
+ $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
</ins><span class="cx">
</span><span class="cx"> return $form_fields;
</span><span class="cx"> }
</span><span class="lines">@@ -993,11 +993,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>- function filter_upload_tabs( $tabs ) {
- if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' )
- return array( 'library' => __('Media Library') );
-
- return $tabs;
</del><ins>+ function filter_upload_tabs() {
+ return array( 'library' => __('Media Library') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>