<!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>[31328] trunk/src/wp-admin/media-upload.php: Remove an extra indent from most of media-new.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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31328">31328</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31328","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-03 07:46:21 +0000 (Tue, 03 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove an extra indent from most of media-new.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminmediauploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/media-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-upload.php 2015-02-03 06:17:05 UTC (rev 31327)
+++ trunk/src/wp-admin/media-upload.php 2015-02-03 07:46:21 UTC (rev 31328)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,70 +31,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset($post_id)? (int) $post_id : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an ID for the edit screen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset($action) && $action == 'edit' && !$ID )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset($action) && $action == 'edit' && !$ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Cheatin’ uh?' ), 403 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
- wp_die( __( 'Cheatin’ uh?' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+ wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Upload type: image, video, file, ..?
- if ( isset($_GET['type']) ) {
- $type = strval($_GET['type']);
- } else {
- /**
- * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
- *
- * @since 2.5.0
- *
- * @param string $type The default media upload type. Possible values include
- * 'image', 'audio', 'video', 'file', etc. Default 'file'.
- */
- $type = apply_filters( 'media_upload_default_type', 'file' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Upload type: image, video, file, ..?
+if ( isset($_GET['type']) ) {
+ $type = strval($_GET['type']);
+} else {
+ /**
+ * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
+ *
+ * @since 2.5.0
+ *
+ * @param string $type The default media upload type. Possible values include
+ * 'image', 'audio', 'video', 'file', etc. Default 'file'.
+ */
+ $type = apply_filters( 'media_upload_default_type', 'file' );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Tab: gallery, library, or type-specific.
- if ( isset($_GET['tab']) ) {
- $tab = strval($_GET['tab']);
- } else {
- /**
- * Filter the default tab in the legacy (pre-3.5.0) media popup.
- *
- * @since 2.5.0
- *
- * @param string $type The default media popup tab. Default 'type' (From Computer).
- */
- $tab = apply_filters( 'media_upload_default_tab', 'type' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Tab: gallery, library, or type-specific.
+if ( isset($_GET['tab']) ) {
+ $tab = strval($_GET['tab']);
+} else {
+ /**
+ * Filter the default tab in the legacy (pre-3.5.0) media popup.
+ *
+ * @since 2.5.0
+ *
+ * @param string $type The default media popup tab. Default 'type' (From Computer).
+ */
+ $tab = apply_filters( 'media_upload_default_tab', 'type' );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body_id = 'media-upload';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$body_id = 'media-upload';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Let the action code decide how to handle the request.
- if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
- /**
- * Fires inside specific upload-type views in the legacy (pre-3.5.0)
- * media popup based on the current tab.
- *
- * The dynamic portion of the hook name, `$type`, refers to the specific
- * media upload type. Possible values include 'image', 'audio', 'video',
- * 'file', etc.
- *
- * The hook only fires if the current `$tab` is 'type' (From Computer),
- * 'type_url' (From URL), or, if the tab does not exist (i.e., has not
- * been registered via the {@see 'media_upload_tabs'} filter.
- *
- * @since 2.5.0
- */
- do_action( "media_upload_$type" );
- } else {
- /**
- * Fires inside limited and specific upload-tab views in the legacy
- * (pre-3.5.0) media popup.
- *
- * The dynamic portion of the hook name, `$tab`, refers to the specific
- * media upload tab. Possible values include 'library' (Media Library),
- * or any custom tab registered via the {@see 'media_upload_tabs'} filter.
- *
- * @since 2.5.0
- */
- do_action( "media_upload_$tab" );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Let the action code decide how to handle the request.
+if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+ /**
+ * Fires inside specific upload-type views in the legacy (pre-3.5.0)
+ * media popup based on the current tab.
+ *
+ * The dynamic portion of the hook name, `$type`, refers to the specific
+ * media upload type. Possible values include 'image', 'audio', 'video',
+ * 'file', etc.
+ *
+ * The hook only fires if the current `$tab` is 'type' (From Computer),
+ * 'type_url' (From URL), or, if the tab does not exist (i.e., has not
+ * been registered via the {@see 'media_upload_tabs'} filter.
+ *
+ * @since 2.5.0
+ */
+ do_action( "media_upload_$type" );
+} else {
+ /**
+ * Fires inside limited and specific upload-tab views in the legacy
+ * (pre-3.5.0) media popup.
+ *
+ * The dynamic portion of the hook name, `$tab`, refers to the specific
+ * media upload tab. Possible values include 'library' (Media Library),
+ * or any custom tab registered via the {@see 'media_upload_tabs'} filter.
+ *
+ * @since 2.5.0
+ */
+ do_action( "media_upload_$tab" );
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>