From 7f9b0fcc1e32cddf5aee60a2777b70b9c30f9e6d Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 18 Nov 2011 08:43:16 +0000
Subject: [PATCH] Don't show the uploader on iPads (it's pointless), fixes
 #19004

git-svn-id: http://svn.automattic.com/wordpress/trunk@19335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php | 40 ++++++++++++++++++++++++++-----------
 wp-admin/media-new.php      |  7 ++++++-
 wp-admin/menu.php           |  3 ++-
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index be11fd0ad..86239f79d 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -62,9 +62,16 @@ add_filter('media_upload_tabs', 'update_gallery_tab');
  * @since 2.5.0
  */
 function the_media_upload_tabs() {
-	global $redir_tab;
+	global $redir_tab, $is_iphone;
 	$tabs = media_upload_tabs();
 
+	if ( $is_iphone ) {
+		unset($tabs['type']);
+		$default = 'type_url';
+	} else {
+		$default = 'type';
+	}
+
 	if ( !empty($tabs) ) {
 		echo "<ul id='sidemenu'>\n";
 		if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) )
@@ -72,13 +79,15 @@ function the_media_upload_tabs() {
 		elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
 			$current = $_GET['tab'];
 		else
-			$current = apply_filters('media_upload_default_tab', 'type');
+			$current = apply_filters('media_upload_default_tab', $default);
 
 		foreach ( $tabs as $callback => $text ) {
 			$class = '';
+
 			if ( $current == $callback )
 				$class = " class='current'";
-			$href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
+
+			$href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
 			$link = "<a href='" . esc_url($href) . "'$class>$text</a>";
 			echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
 		}
@@ -344,13 +353,7 @@ if ( is_string($content_func) )
 </head>
 <body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="no-js">
 <script type="text/javascript">
-//<![CDATA[
-(function(){
-var c = document.body.className;
-c = c.replace(/no-js/, 'js');
-document.body.className = c;
-})();
-//]]>
+document.body.className = document.body.className.replace('no-js', 'js');
 </script>
 <?php
 	$args = func_get_args();
@@ -497,6 +500,8 @@ function media_upload_form_handler() {
  * @return unknown
  */
 function wp_media_upload_handler() {
+	global $is_iphone;
+
 	$errors = array();
 	$id = 0;
 
@@ -567,7 +572,10 @@ function wp_media_upload_handler() {
 		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
 	}
 
-	return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
+	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 );
 }
 
 /**
@@ -1263,7 +1271,10 @@ function media_upload_header() {
  * @param unknown_type $errors
  */
 function media_upload_form( $errors = null ) {
-	global $type, $tab, $pagenow, $is_IE, $is_opera;
+	global $type, $tab, $pagenow, $is_IE, $is_opera, $is_iphone;
+
+	if ( $is_iphone )
+		return;
 
 	$upload_action_url = admin_url('async-upload.php');
 	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
@@ -1387,6 +1398,11 @@ echo ' ' . __('After a file has been uploaded, you can add titles and descriptio
  * @param unknown_type $id
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+	global $is_iphone;
+
+	if ( $is_iphone )
+		return;
+
 	media_upload_header();
 
 	$post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php
index d4e3cabf4..a257f9458 100644
--- a/wp-admin/media-new.php
+++ b/wp-admin/media-new.php
@@ -6,9 +6,14 @@
  * @subpackage Administration
  */
 
+global $is_iphone;
+
+if ( $is_iphone ) // cannot upload files from iPhone/iPad
+	return;
+
 $_GET['inline'] = 'true';
 /** Administration bootstrap */
 require_once('./admin.php');
 require_once('./media-upload.php');
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 9f2e0ff83..050bbd166 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -56,7 +56,8 @@ $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu
 $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'div' );
 	$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
 	/* translators: add new file */
-	$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
+	if ( !$is_iphone )
+		$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
 
 $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'div' );
 	$submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );