Changeset 19335

Timestamp:

11/18/2011 08:43:16 AM (13 years ago)

Author:

azaozz

Message:

Don't show the uploader on iPads (it's pointless), fixes #19004

Location:

trunk/wp-admin

Files:

• includes/media.php (modified) (7 diffs)
• media-new.php (modified) (1 diff)
• menu.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -63 +63 @@
  */
 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) ) {
@@ -73 +80 @@
             $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";
@@ -345 +354 @@
 <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
@@ -498 +501 @@
  */
 function wp_media_upload_handler() {
+    global $is_iphone;
+
     $errors = array();
     $id = 0;
@@ -568 +573 @@
     }
 
-    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 );
 }
 
@@ -1264 +1272 @@
  */
 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');
@@ -1388 +1399 @@
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+    global $is_iphone;
+
+    if ( $is_iphone )
+        return;
+
     media_upload_header();
 

trunk/wp-admin/media-new.php

@@ -7 +7 @@
  */
 
+global $is_iphone;
+
+if ( $is_iphone ) // cannot upload files from iPhone/iPad
+    return;
+
 $_GET['inline'] = 'true';
 /** Administration bootstrap */

trunk/wp-admin/menu.php

@@ -57 +57 @@
     $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' );