memory_limit must be now at least 128 MB (from: recommended)

Certain actions, e.g. handling update servers or rebuilding the style can easily hit the 64 MB mark, causing the script to be halted. Except for some super poor rip-off webspaces this is not going to cause any real trouble.

diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 62bd19550da7cc325dbb368c7e5b0e6a659aedeb..f5309a44b3b40ef4568a1eb870f266bc4a7d7d08 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -16,6 +16,17 @@
                </dl>
        </fieldset>
        
+       <fieldset>
+               <legend>{lang}wcf.global.systemRequirements.memoryLimit{/lang}</legend>
+               <dl>
+                       <dt>{lang}wcf.global.systemRequirements.element.required{/lang} 128 M</dt>
+                       <dd>
+                               {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.memoryLimit.result}red{else}green{/if}">{$system.memoryLimit.value}</span>
+                               {if !$system.memoryLimit.result}<small>{lang}wcf.global.systemRequirements.memoryLimit.description{/lang}</small>{/if}
+                       </dd>
+               </dl>
+       </fieldset>
+       
        <fieldset>
                <legend>{lang}wcf.global.systemRequirements.sql{/lang}</legend>
                <dl>
@@ -36,17 +47,6 @@
 </header>
 
 <div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.global.systemRequirements.memoryLimit{/lang}</legend>
-               <dl>
-                       <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} &gt; 64 M</dt>
-                       <dd>
-                               {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.memoryLimit.result}yellow{else}green{/if}">{$system.memoryLimit.value}</span>
-                               {if !$system.memoryLimit.result}<small>{lang}wcf.global.systemRequirements.memoryLimit.description{/lang}</small>{/if}
-                       </dd>
-               </dl>
-       </fieldset>
-       
        <fieldset>
                <legend>{lang}wcf.global.systemRequirements.uploadMaxFilesize{/lang}</legend>
                <dl>
@@ -72,7 +72,7 @@
 
 <form method="post" action="install.php">
        <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result} disabled="disabled"{/if} accesskey="s"/>
+               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.memoryLimit.result} disabled="disabled"{/if} accesskey="s"/>
                <input type="hidden" name="step" value="{@$nextStep}" />
                <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
                <input type="hidden" name="languageCode" value="{@$languageCode}" />