Fixed bug #9766: Use correct memory limit definition in Install Tool

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6586 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 526738b..9716747 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
        * Fixed bug #12788: Recycler does not show up
        * Fixed bug #12825: Wrong encoding of labels in t3editor
        * Fixed bug #12766: CSS in "User Settings" broken (thanks to Georg Ringer)
+       * Fixed bug #9766: Use correct memory limit definition in Install Tool (thanks to Steffen Mueller)
 
 2009-11-26  Francois Suter  <francois@typo3.org>
 

diff --git a/typo3/sysext/install/mod/class.tx_install.php b/typo3/sysext/install/mod/class.tx_install.php
index bf9cfc7..c88c31f 100755 (executable)
--- a/typo3/sysext/install/mod/class.tx_install.php
+++ b/typo3/sysext/install/mod/class.tx_install.php
@@ -142,6 +142,9 @@
  *
  */
 
+// include requirements definition:
+require_once(t3lib_extMgm::extPath('install') . 'requirements.php');
+
 // include update classes
 require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_compatversion.php');
 require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_cscsplit.php');
@@ -1504,11 +1507,12 @@ From sub-directory:
                        // Memory and functions
                        // *****************
                $memory_limit_value = $this->convertByteSize(ini_get('memory_limit'));
-               if ($memory_limit_value && $memory_limit_value < 16*1024*1024)  {
-                       $this->message($ext, 'Memory limit below 16 MB',"
-                               <i>memory_limit=".ini_get('memory_limit')."</i>
-                               Your system is configured to enforce a memory limit of PHP scripts lower than 16 MB. The Extension Manager needs to include more PHP-classes than will fit into this memory space. There is nothing else to do than raise the limit. To be safe, ask the system administrator of the webserver to raise the limit to over 25 MB.
-                       ",3);
+               
+               if ($memory_limit_value && $memory_limit_value < t3lib_div::getBytesFromSizeMeasurement(TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT)) {
+                       $this->message($ext, 'Memory limit below ' . TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT,'
+                               <i>memory_limit=' . ini_get('memory_limit') . '</i>
+                               Your system is configured to enforce a memory limit of PHP scripts lower than ' . TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT . '. The Extension Manager needs to include more PHP-classes than will fit into this memory space. There is nothing else to do than raise the limit. To be safe, ask the system administrator of the webserver to raise the limit to over ' . TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT . '.
+                       ',3);
                } elseif(!$memory_limit_value) {
                        $this->message($ext, 'Memory limit',"<i>No memory limit in effect.</i>",-1);
                } else $this->message($ext, 'Memory limit',"<i>memory_limit=".ini_get('memory_limit')."</i>",-1);