Merge branch '3.0.2' into 3.0

This commit is contained in:
Ingo Schommer 2012-09-12 09:50:38 +02:00
commit 8772eb3e18

View File

@ -936,6 +936,8 @@ after')
}
function testRenderWithSourceFileComments() {
$origType = Director::get_environment_type();
Director::set_environment_type('dev');
SSViewer::set_source_file_comments(true);
$view = new SSViewer(array('SSViewerTestCommentsFullSource'));
@ -965,6 +967,7 @@ after')
$this->assertEquals($result, $expected);
SSViewer::set_source_file_comments(false);
Director::set_environment_type($origType);
}
function testLoopIteratorIterator() {