Changeset 20449

Timestamp:

04/12/2012 12:16:37 AM (13 years ago)

Author:

azaozz

Message:

Don't hide links to the upload form and show an error for mobile devices that cannot upload, see #20410

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (4 diffs)
• wp-admin/media-new.php (modified) (1 diff)
• wp-admin/media.php (modified) (1 diff)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -65 +65 @@
     global $redir_tab;
     $tabs = media_upload_tabs();
-
-    if ( wp_is_mobile() ) {
-        unset($tabs['type']);
-        $default = 'type_url';
-    } else {
-        $default = 'type';
-    }
+    $default = 'type';
 
     if ( !empty($tabs) ) {
@@ -599 +593 @@
     }
 
-    if ( wp_is_mobile() )
-        return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
-    else
-        return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
+    return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
 }
 
@@ -1307 +1298 @@
     global $type, $tab, $pagenow, $is_IE, $is_opera;
 
-    if ( wp_is_mobile() )
+    if ( ! _device_can_upload() ) {
+        echo '<p>' . __('The web browser on your device cannot be used to upload files. You may be able to use the <a href=" http://wordpress.org/extend/mobile/">native app for your device</a> instead.') . '</p>';
         return;
+    }
 
     $upload_action_url = admin_url('async-upload.php');
@@ -1439 +1432 @@
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
-    if ( wp_is_mobile() )
-        return;
 
     media_upload_header();

trunk/wp-admin/media-new.php

@@ -10 +10 @@
 /** Administration bootstrap */
 require_once('./admin.php');
-
-if ( wp_is_mobile() ) // cannot upload files from mobile devices
-    return;
-
 require_once('./media-upload.php');

trunk/wp-admin/media.php

@@ -107 +107 @@
 <?php
 echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) && ! wp_is_mobile() ) { ?>
+if ( current_user_can( 'upload_files' ) ) { ?>
     <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a>
 <?php } ?>

trunk/wp-admin/menu.php

@@ -57 +57 @@
     $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
     /* translators: add new file */
-    if ( ! wp_is_mobile() )
-        $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
+    $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' );

trunk/wp-admin/upload.php

@@ -180 +180 @@
 <?php
 echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) && ! wp_is_mobile() ) { ?>
+if ( current_user_can( 'upload_files' ) ) { ?>
     <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }

trunk/wp-includes/admin-bar.php

@@ -490 +490 @@
     }
 
-    if ( current_user_can( 'upload_files' ) && ! wp_is_mobile() )
+    if ( current_user_can( 'upload_files' ) )
         $actions[ 'media-new.php' ] = array( _x( 'Media', 'add new from admin bar' ), 'new-media' );
 

trunk/wp-includes/functions.php

@@ -3677 +3677 @@
 }
 
+/**
+ * Test if the current device has the capability to upload files.
+ *
+ * @since 3.4.0
+ * @access private
+ *
+ * @return bool true|false
+ */
+function _device_can_upload() {
+    if ( ! wp_is_mobile() )
+        return true;
+
+    $ua = $_SERVER['HTTP_USER_AGENT'];
+    
+    if ( strpos($ua, 'iPhone') !== false
+        || strpos($ua, 'iPad') !== false
+        || strpos($ua, 'iPod') !== false ) {
+            return false;
+    } else {
+        return true;
+    }
+}
+