Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2013-09-27 19:44:03 +02:00
commit cc2dcb2c4f

View File

@ -302,7 +302,7 @@ class CMSMainTest extends FunctionalTest {
); );
$this->assertFalse($response->isError()); $this->assertFalse($response->isError());
$this->assertContains( $this->assertContains(
_t('SiteTree.PageTypeNotAllowed', array('type' => 'Page')), htmlentities(_t('SiteTree.PageTypeNotAllowed', array('type' => 'Page'))),
$response->getBody() $response->getBody()
); );