<!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>[22673] trunk/wp-admin/includes/media.php: Move code from image_attachment_fields_to_edit() to get_attachment_fields_to_edit().</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/22673">22673</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-19 08:10:38 +0000 (Mon, 19 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move code from image_attachment_fields_to_edit() to get_attachment_fields_to_edit(). The level of abstraction is unnecessary, and it makes it more difficult to call only the filter in the new media modal. Also, that function is sloooow. see <a href="http://core.trac.wordpress.org/ticket/22186">#22186</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22672 => 22673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2012-11-19 07:30:53 UTC (rev 22672)
+++ trunk/wp-admin/includes/media.php 2012-11-19 08:10:38 UTC (rev 22673)
</span><span class="lines">@@ -810,35 +810,9 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function image_attachment_fields_to_edit($form_fields, $post) {
</span><del>- if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
- $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
- if ( empty($alt) )
- $alt = '';
-
- $form_fields['post_title']['required'] = true;
-
- $form_fields['image_alt'] = array(
- 'value' => $alt,
- 'label' => __('Alternative Text'),
- 'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
- );
-
- $form_fields['align'] = array(
- 'label' => __('Alignment'),
- 'input' => 'html',
- 'html' => image_align_input_fields($post, get_option('image_default_align')),
- );
-
- $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
-
- } else {
- unset( $form_fields['image_alt'] );
- }
</del><span class="cx"> return $form_fields;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2);
-
</del><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -1000,6 +974,34 @@
</span><span class="cx"> // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
</span><span class="cx"> $form_fields = array_merge_recursive($form_fields, (array) $errors);
</span><span class="cx">
</span><ins>+ // This was formerly in image_attachment_fields_to_edit().
+ if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+ $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
+ if ( empty($alt) )
+ $alt = '';
+
+ $form_fields['post_title']['required'] = true;
+
+ $form_fields['image_alt'] = array(
+ 'value' => $alt,
+ 'label' => __('Alternative Text'),
+ 'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
+ );
+
+ $form_fields['align'] = array(
+ 'label' => __('Alignment'),
+ 'input' => 'html',
+ 'html' => image_align_input_fields($post, get_option('image_default_align')),
+ );
+
+ $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+
+ } else {
+ unset( $form_fields['image_alt'] );
+ }
+
+ return $form_fields;
+
</ins><span class="cx"> $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
</span><span class="cx">
</span><span class="cx"> return $form_fields;
</span></span></pre>
</div>
</div>
</body>
</html>