mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
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
This commit is contained in:
parent
f0d03207a6
commit
5fe548f7b5
@ -350,7 +350,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
|||||||
|
|
||||||
function tearDown() {
|
function tearDown() {
|
||||||
// Preserve memory settings
|
// Preserve memory settings
|
||||||
ini_set('memory_limit', $this->originalMemoryLimit);
|
ini_set('memory_limit', ($this->originalMemoryLimit) ? $this->originalMemoryLimit : -1);
|
||||||
|
|
||||||
// Restore email configuration
|
// Restore email configuration
|
||||||
Email::set_mailer($this->originalMailer);
|
Email::set_mailer($this->originalMailer);
|
||||||
|
Loading…
Reference in New Issue
Block a user