[#3105] Improve memory_limit check in setup to accept integer values …

…from PHP instances
modxcms · Dec 17, 2010 · 8bef762 · 8bef762
1 parent cec1499
commit 8bef762
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -4,6 +4,7 @@ development release, and is only shown to give an idea of what's currently in th
 
 MODx Revolution 2.0.6-pl
 ====================================
+- [#3105] Improve memory_limit check in setup to accept integer values from PHP instances
 - [#3106] Add sanity check to resource create/update processors to disallow invalid Resource Group ID references
 - [#3038] Fix problems with filemanager_path settings and absolute URLs in image TV values
 - [#3039] Add symlink_merge_fields setting to disable modSymLink merge behavior

diff --git a/setup/includes/modinstalltest.class.php b/setup/includes/modinstalltest.class.php
@@ -106,6 +106,7 @@ protected function _checkMemoryLimit() {
      * @return integer The string converted into a proper integer bytes
      */
     protected function _returnBytes($val) {
+        if (is_integer($val)) return $val;
         $val = trim($val);
         $num = intval(substr($val,0,strlen($val)-1));
         $last = strtolower(substr($val,-1));