<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15689] trunk/wp-includes/media.php:
Docs and breathing room for get_media_buttons() and friends.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15689">15689</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-03 03:08:39 +0000 (Sun, 03 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Docs and breathing room for get_media_buttons() and friends. see <a href="http://trac.wordpress.org/ticket/14966">#14966</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (15688 => 15689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-10-03 02:58:59 UTC (rev 15688)
+++ trunk/wp-includes/media.php 2010-10-03 03:08:39 UTC (rev 15689)
</span><span class="lines">@@ -1397,33 +1397,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Generate HTML for the editor media buttons (image, video, audio).
</ins><span class="cx"> *
</span><ins>+ * @since 3.1.0
</ins><span class="cx"> *
</span><del>- *
</del><ins>+ * @return string HTML
</ins><span class="cx"> */
</span><del>-function get_media_buttons(){
</del><ins>+function get_media_buttons() {
</ins><span class="cx"> $do_image = $do_audio = $do_video = true;
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $media_buttons = get_site_option( 'mu_media_buttons' );
</span><del>- if ( empty($media_buttons['image']) )
</del><ins>+ if ( empty( $media_buttons['image'] ) )
</ins><span class="cx"> $do_image = false;
</span><del>- if ( empty($media_buttons['audio']) )
</del><ins>+ if ( empty( $media_buttons['audio'] ) )
</ins><span class="cx"> $do_audio = false;
</span><del>- if ( empty($media_buttons['video']) )
</del><ins>+ if ( empty( $media_buttons['video'] ) )
</ins><span class="cx"> $do_video = false;
</span><span class="cx"> }
</span><span class="cx"> $out = '';
</span><span class="cx">
</span><span class="cx"> if ( $do_image )
</span><del>- $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image');
</del><ins>+ $out .= _media_button( __( 'Add an Image' ), 'images/media-button-image.gif?ver=20100531', 'image' );
</ins><span class="cx"> if ( $do_video )
</span><del>- $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video');
</del><ins>+ $out .= _media_button( __( 'Add Video' ), 'images/media-button-video.gif?ver=20100531', 'video' );
</ins><span class="cx"> if ( $do_audio )
</span><del>- $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio');
</del><ins>+ $out .= _media_button( __( 'Add Audio' ), 'images/media-button-music.gif?ver=20100531', 'audio' );
</ins><span class="cx">
</span><del>- $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media');
</del><ins>+ $out .= _media_button( __( 'Add Media' ), 'images/media-button-other.gif?ver=20100531', 'media' );
</ins><span class="cx">
</span><del>- $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
</del><ins>+ $context = apply_filters( 'media_buttons_context', __( 'Upload/Insert %s' ) );
</ins><span class="cx">
</span><span class="cx"> return sprintf($context, $out);
</span><span class="cx">
</span><span class="lines">@@ -1440,18 +1442,29 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'media_buttons', 'media_buttons' );
</span><span class="cx">
</span><del>-function _media_button($title, $icon, $type) {
- return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
</del><ins>+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ * @access private
+ */
+function _media_button( $title, $icon, $type ) {
+ return "<a href='" . esc_url( get_upload_iframe_src( $type ) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function get_upload_iframe_src($type) {
</del><ins>+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ */
+function get_upload_iframe_src( $type ) {
</ins><span class="cx"> global $post_ID, $temp_ID;
</span><del>- $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
- $upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php');
</del><ins>+ $uploading_iframe_ID = (int) ( 0 == $post_ID ? $temp_ID : $post_ID );
+ $upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, 'media-upload.php' );
</ins><span class="cx">
</span><span class="cx"> if ( 'media' != $type )
</span><del>- $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
- $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
</del><ins>+ $upload_iframe_src = add_query_arg( 'type', $type, $upload_iframe_src );
+ $upload_iframe_src = apply_filters( $type . '_upload_iframe_src', $upload_iframe_src );
</ins><span class="cx">
</span><del>- return add_query_arg('TB_iframe', true, $upload_iframe_src);
</del><ins>+ return add_query_arg( 'TB_iframe', true, $upload_iframe_src );
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>