Ticket #21650: 14157-ms-php.fixed.diff

media.php

@@ -3020 +3020 @@
 
                 // Media Library
                 'editMetadata' => __( 'Edit Metadata' ),
-                'noMedia'      => __( 'No media found. Try a different search.' ),
+                'noMedia'      => __( 'No media attachments found.' ),
         );
 
         /**

cache.php

@@ -639 +639 @@
                 echo "</p>";
                 echo '<ul>';
                 foreach ($this->cache as $group => $cache) {
-                        echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
+                        try {
+                                echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
+                        } catch( Exception $e ) {
+                                echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( print_r( $cache, true ) ) / 1024, 2 ) . 'k )</li>';
+                        }
                 }
                 echo '</ul>';
         }

default-constants.php

@@ -18 +18 @@
         // set memory limits
         if ( !defined('WP_MEMORY_LIMIT') ) {
                 if( is_multisite() ) {
+                        define('WP_MEMORY_LIMIT', '80M');
+                } else {
                         define('WP_MEMORY_LIMIT', '64M');
-                } else {
-                        define('WP_MEMORY_LIMIT', '40M');
                 }
         }