From 5fe548f7b5823984face4bccb8c0655138ea8e97 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Oct 2010 02:59:10 +0000 Subject: [PATCH] MINOR Fixed memory limit setting in SapphireTest (regression from r106128) (from r106190) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112525 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/SapphireTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php index dd297be00..765c56cd9 100755 --- a/dev/SapphireTest.php +++ b/dev/SapphireTest.php @@ -350,7 +350,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase { function tearDown() { // Preserve memory settings - ini_set('memory_limit', $this->originalMemoryLimit); + ini_set('memory_limit', ($this->originalMemoryLimit) ? $this->originalMemoryLimit : -1); // Restore email configuration Email::set_mailer($this->originalMailer);