Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WP_MEMORY_LIMIT defaults to 40MB, but only sets that value if more than system memory.

This commit is contained in:
Mike Jolley 2015-11-25 18:53:20 +00:00
parent 27a7793f00
commit f9756b29f1
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/admin/views/html-admin-page-status-report.php
View File

@ -66,6 +66,11 @@ if ( ! defined( 'ABSPATH' ) ) {
<td><?php <td><?php
$memory = wc_let_to_num( WP_MEMORY_LIMIT ); $memory = wc_let_to_num( WP_MEMORY_LIMIT );
if ( function_exists( 'memory_get_usage' ) ) {
$system_memory = wc_let_to_num( @ini_get( 'memory_limit' ) );
$memory = max( $memory, $system_memory );
}
if ( $memory < 67108864 ) { if ( $memory < 67108864 ) {
echo '<mark class="error">' . sprintf( __( '%s - We recommend setting memory to at least 64MB. See: <a href="%s" target="_blank">Increasing memory allocated to PHP</a>', 'woocommerce' ), size_format( $memory ), 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . '</mark>'; echo '<mark class="error">' . sprintf( __( '%s - We recommend setting memory to at least 64MB. See: <a href="%s" target="_blank">Increasing memory allocated to PHP</a>', 'woocommerce' ), size_format( $memory ), 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . '</mark>';
} else { } else {

6
includes/class-wc-tracker.php
View File

@ -154,6 +154,12 @@ class WC_Tracker {
$wp_data = array(); $wp_data = array();
$memory = wc_let_to_num( WP_MEMORY_LIMIT ); $memory = wc_let_to_num( WP_MEMORY_LIMIT );
if ( function_exists( 'memory_get_usage' ) ) {
$system_memory = wc_let_to_num( @ini_get( 'memory_limit' ) );
$memory = max( $memory, $system_memory );
}
$wp_data['memory_limit'] = size_format( $memory ); $wp_data['memory_limit'] = size_format( $memory );
$wp_data['debug_mode'] = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No'; $wp_data['debug_mode'] = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No';
$wp_data['locale'] = get_locale(); $wp_data['locale'] = get_locale();