From 899e41efd51d0d2024ed703fe7874bc3b8a13293 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 3 Jun 2010 04:24:08 +0000 Subject: [PATCH] MINOR: Don't run memory limit tests in safe mode, git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106156 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/MemoryLimitTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/MemoryLimitTest.php b/tests/MemoryLimitTest.php index 222a27b63..cbb60c705 100644 --- a/tests/MemoryLimitTest.php +++ b/tests/MemoryLimitTest.php @@ -82,6 +82,9 @@ class MemoryLimitTest extends SapphireTest { $exts = get_loaded_extensions(); // see http://www.hardened-php.net/suhosin/configuration.html#suhosin.memory_limit if(in_array('suhosin', $exts)) return false; + + // We can't change memory limit in safe mode + if(strtolower(ini_get('safe_mode')) == 'on') return false; return true; }