Ticket #13575: 13575.patch

wp-admin/includes/template.php

@@ -2727 +2727 @@
         $u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
         $p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
         $bytes = apply_filters( 'upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes );
+
+        $m_bytes = wp_convert_hr_to_bytes( ini_get( 'memory_limit' ) );
+        $m_bytes = apply_filters( 'memory_limit', $m_bytes); 
+        if ($m_bytes <> -1) {
+                $bytes = min($bytes, $m_bytes);
+        }
+
         return $bytes;
 }