<!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>[19335] trunk/wp-admin: Don't show the uploader on iPads (it's pointless), fixes #19004</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/19335">19335</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-18 08:43:16 +0000 (Fri, 18 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't show the uploader on iPads (it's pointless), fixes <a href="http://core.trac.wordpress.org/ticket/19004">#19004</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminmedianewphp">trunk/wp-admin/media-new.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.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 (19334 => 19335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2011-11-18 07:00:26 UTC (rev 19334)
+++ trunk/wp-admin/includes/media.php 2011-11-18 08:43:16 UTC (rev 19335)
</span><span class="lines">@@ -62,9 +62,16 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> */
</span><span class="cx"> function the_media_upload_tabs() {
</span><del>- global $redir_tab;
</del><ins>+ global $redir_tab, $is_iphone;
</ins><span class="cx"> $tabs = media_upload_tabs();
</span><span class="cx">
</span><ins>+ if ( $is_iphone ) {
+ unset($tabs['type']);
+ $default = 'type_url';
+ } else {
+ $default = 'type';
+ }
+
</ins><span class="cx"> if ( !empty($tabs) ) {
</span><span class="cx"> echo "<ul id='sidemenu'>\n";
</span><span class="cx"> if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) )
</span><span class="lines">@@ -72,13 +79,15 @@
</span><span class="cx"> elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
</span><span class="cx"> $current = $_GET['tab'];
</span><span class="cx"> else
</span><del>- $current = apply_filters('media_upload_default_tab', 'type');
</del><ins>+ $current = apply_filters('media_upload_default_tab', $default);
</ins><span class="cx">
</span><span class="cx"> foreach ( $tabs as $callback => $text ) {
</span><span class="cx"> $class = '';
</span><ins>+
</ins><span class="cx"> if ( $current == $callback )
</span><span class="cx"> $class = " class='current'";
</span><del>- $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
</del><ins>+
+ $href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
</ins><span class="cx"> $link = "<a href='" . esc_url($href) . "'$class>$text</a>";
</span><span class="cx"> echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
</span><span class="cx"> }
</span><span class="lines">@@ -344,13 +353,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="no-js">
</span><span class="cx"> <script type="text/javascript">
</span><del>-//<![CDATA[
-(function(){
-var c = document.body.className;
-c = c.replace(/no-js/, 'js');
-document.body.className = c;
-})();
-//]]>
</del><ins>+document.body.className = document.body.className.replace('no-js', 'js');
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> $args = func_get_args();
</span><span class="lines">@@ -497,6 +500,8 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function wp_media_upload_handler() {
</span><ins>+ global $is_iphone;
+
</ins><span class="cx"> $errors = array();
</span><span class="cx"> $id = 0;
</span><span class="cx">
</span><span class="lines">@@ -567,7 +572,10 @@
</span><span class="cx"> return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
</del><ins>+ if ( $is_iphone )
+ return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
+ else
+ return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1263,8 +1271,11 @@
</span><span class="cx"> * @param unknown_type $errors
</span><span class="cx"> */
</span><span class="cx"> function media_upload_form( $errors = null ) {
</span><del>- global $type, $tab, $pagenow, $is_IE, $is_opera;
</del><ins>+ global $type, $tab, $pagenow, $is_IE, $is_opera, $is_iphone;
</ins><span class="cx">
</span><ins>+ if ( $is_iphone )
+ return;
+
</ins><span class="cx"> $upload_action_url = admin_url('async-upload.php');
</span><span class="cx"> $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
</span><span class="cx"> $_type = isset($type) ? $type : '';
</span><span class="lines">@@ -1387,6 +1398,11 @@
</span><span class="cx"> * @param unknown_type $id
</span><span class="cx"> */
</span><span class="cx"> function media_upload_type_form($type = 'file', $errors = null, $id = null) {
</span><ins>+ global $is_iphone;
+
+ if ( $is_iphone )
+ return;
+
</ins><span class="cx"> media_upload_header();
</span><span class="cx">
</span><span class="cx"> $post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
</span></span></pre></div>
<a id="trunkwpadminmedianewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-new.php (19334 => 19335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-new.php 2011-11-18 07:00:26 UTC (rev 19334)
+++ trunk/wp-admin/media-new.php 2011-11-18 08:43:16 UTC (rev 19335)
</span><span class="lines">@@ -6,9 +6,14 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+global $is_iphone;
+
+if ( $is_iphone ) // cannot upload files from iPhone/iPad
+ return;
+
</ins><span class="cx"> $_GET['inline'] = 'true';
</span><span class="cx"> /** Administration bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx"> require_once('./media-upload.php');
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (19334 => 19335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-11-18 07:00:26 UTC (rev 19334)
+++ trunk/wp-admin/menu.php 2011-11-18 08:43:16 UTC (rev 19335)
</span><span class="lines">@@ -56,7 +56,8 @@
</span><span class="cx"> $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'div' );
</span><span class="cx"> $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
</span><span class="cx"> /* translators: add new file */
</span><del>- $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
</del><ins>+ if ( !$is_iphone )
+ $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
</ins><span class="cx">
</span><span class="cx"> $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'div' );
</span><span class="cx"> $submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
</span></span></pre>
</div>
</div>
</body>
</html>