tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR fixed language (from r94920)

This commit is contained in:
Tom Rix 2010-03-01 21:42:05 +00:00
parent 2fc9bef6e2
commit bd649d170d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_config.php
View File

@ -14,8 +14,8 @@ Object::add_extension('LeftAndMain', 'ControllerSubsites');
Object::add_extension('Group', 'GroupSubsites');
Object::add_extension('Member', 'MemberSubsites');
//Object::add_extension('File', 'FileSubsites');
// Object::add_extension('File', 'FileSubsites');
Object::add_extension('ErrorPage', 'ErrorPageSubsite');
if (class_exists('SiteConfig')) Object::add_extension('SiteConfig', 'SiteConfigSubsites');
?>
?>

14
tests/SubsitesVirtualPageTest.php
View File

@ -145,15 +145,15 @@ class SubsitesVirtualPageTest extends SapphireTest {
$page = $this->objFromFixture('SiteTree', 'importantpage');
$page->doUnpublish();
$subsite = $this->objFromFixture('Subsite_Template', 'subsite1');
Subsite::changeSubsite($subsite->ID);
$onLive = Versioned::get_by_stage('Page', 'Live', "SiteTree_Live.ID = ".$vp1->ID);
$this->assertNull($onLive, 'SVP has been removed from live');
Subsite::changeSubsite($vp1->SubsiteID);
$_REQUEST['showqueries']=1;
$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "SiteTree_Live.ID = ".$vp1->ID);
$this->assertFalse($onLive, 'SVP has been removed from live');
$subsite = $this->objFromFixture('Subsite_Template', 'subsite2');
Subsite::changeSubsite($subsite->ID);
$onLive = Versioned::get_by_stage('Page', 'Live', "SiteTree_Live.ID = ".$vp2->ID);
$this->assertNull($onLive, 'SVP has been removed from live');
Subsite::changeSubsite($vp2->SubsiteID);
$onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "SiteTree_Live.ID = ".$vp2->ID);
$this->assertFalse($onLive, 'SVP has been removed from live');
}
function fixVersionNumberCache($page) {