Changeset 29776

Timestamp:

09/29/2014 12:13:47 AM (11 years ago)

Author:

azaozz

Message:

Media: disable multi-file uploading in iOS 7.x Safari as it prevents uploading of videos. Fixes #29602 for trunk.

Location:

trunk/src

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/media.php

@@ -1797 +1797 @@
 );
 
-// Currently only iOS Safari supports multiple files uploading but has a bug that prevents uploading of videos
+// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 // when enabled. See #29602.
-if ( wp_is_mobile() ) {
+if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+    strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+
     $plupload_init['multi_selection'] = false;
 }

trunk/src/wp-includes/media.php

@@ -2537 +2537 @@
     );
 
-    // Currently only iOS Safari supports multiple files uploading but has a bug that prevents uploading of videos
+    // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
     // when enabled. See #29602.
-    if ( wp_is_mobile() ) {
+    if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+        strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+
         $defaults['multi_selection'] = false;
     }