mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-30 05:09:06 +02:00
REVERT: reverse merging the change, it breaks some tests. (from r98873)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102810 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
03201e6201
commit
afb7b5eda5
@ -34,7 +34,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
||||
protected $originalRequirements;
|
||||
protected $originalIsRunningTest;
|
||||
protected $originalTheme;
|
||||
protected $originalNestedURLsState;
|
||||
|
||||
protected $mailer;
|
||||
|
||||
@ -111,9 +110,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
||||
|
||||
$this->originalTheme = SSViewer::current_theme();
|
||||
|
||||
// Save nested_urls state, so we can restore it later
|
||||
$this->originalNestedURLsState = SiteTree::nested_urls();
|
||||
|
||||
$className = get_class($this);
|
||||
$fixtureFile = eval("return {$className}::\$fixture_file;");
|
||||
|
||||
@ -350,12 +346,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
||||
|
||||
// Reset mocked datetime
|
||||
SS_Datetime::clear_mock_now();
|
||||
|
||||
// Restore nested_urls state
|
||||
if ( $this->originalNestedURLsState )
|
||||
SiteTree::enable_nested_urls();
|
||||
else
|
||||
SiteTree::disable_nested_urls();
|
||||
}
|
||||
/**
|
||||
* Clear the log of emails sent
|
||||
|
Loading…
Reference in New Issue
Block a user