Ticket #20410: 20410.patch

wp-admin/includes/media.php

@@ -65 +65 @@
         global $redir_tab;
         $tabs = media_upload_tabs();
 
-        if ( wp_is_mobile() ) {
+        if ( ! _device_can_upload() ) {
                 unset($tabs['type']);
                 $default = 'type_url';
         } else {
@@ -598 +598 @@
                 return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
         }
 
-        if ( wp_is_mobile() )
+        if ( ! _device_can_upload() )
                 return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
         else
                 return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
@@ -1306 +1306 @@
 function media_upload_form( $errors = null ) {
         global $type, $tab, $pagenow, $is_IE, $is_opera;
 
-        if ( wp_is_mobile() )
+        if ( ! _device_can_upload() )
                 return;
 
         $upload_action_url = admin_url('async-upload.php');
@@ -1438 +1438 @@
  * @param unknown_type $id
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
-        if ( wp_is_mobile() )
+        if ( ! _device_can_upload() )
                 return;
 
         media_upload_header();

wp-admin/media-new.php

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

wp-admin/media.php

@@ -106 +106 @@
 <h2>
 <?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 } ?>
 </h2>

wp-admin/menu.php

@@ -56 +56 @@
 $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 */
-        if ( ! wp_is_mobile() )
+        if ( current_user_can( 'upload_files' ) )
                 $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' );

wp-admin/upload.php

@@ -179 +179 @@
 <h2>
 <?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
 }
 if ( ! empty( $_REQUEST['s'] ) )

wp-includes/admin-bar.php

@@ -489 +489 @@
                 unset( $cpts['post'] );
         }
 
-        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' );
 
         if ( current_user_can( 'manage_links' ) )

wp-includes/capabilities.php

@@ -1172 +1172 @@
                 else
                         $caps[] = 'do_not_allow';
                 break;
+        case 'upload_files':
+                if ( ! _device_can_upload() )
+                        $caps[] = 'do_not_allow';
+                break;
         default:
                 // Handle meta capabilities for custom post types.
                 $post_type_meta_caps = _post_type_meta_capabilities();

wp-includes/functions.php

@@ -3673 +3673 @@
         return $clean;
 }
 
+/**
+ * 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() {
+        global $is_iphone;
+
+        return ( ! $is_iphone );
+}
+

wp-includes/vars.php

@@ -73 +73 @@
         }
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && ( stripos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false ) )
         $is_iphone = true;
 
 $is_IE = ( $is_macIE || $is_winIE );