From fe0cf8be7d0d6310260543d56207b81388fc44ab Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Mon, 1 Mar 2010 22:41:44 +0000
Subject: [PATCH] BUGFIX syntax errors

---
 code/SiteTreeSubsites.php     | 45 -----------------------------------
 code/SubsiteReportWrapper.php |  2 +-
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/code/SiteTreeSubsites.php b/code/SiteTreeSubsites.php
index edb7944..792730c 100644
--- a/code/SiteTreeSubsites.php
+++ b/code/SiteTreeSubsites.php
@@ -272,43 +272,6 @@ class SiteTreeSubsites extends SiteTreeDecorator {
 		return $sc;
 	}
 	
-	/**
-	 * Returns the RelatedPageLink objects that are reverse-associated with this page.
-	 */
-	function ReverseRelated() {
-		return DataObject::get('RelatedPageLink', "\"RelatedPageLink\".\"RelatedPageID\" = {$this->owner->ID}
-			AND R2.\"ID\" IS NULL", '',
-			"INNER JOIN \"SiteTree\" ON \"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\"
-			LEFT JOIN \"RelatedPageLink\" AS R2 ON R2.MasterPageID = {$this->owner->ID}
-			AND R2.RelatedPageID = RelatedPageLink.MasterPageID
-			"
-		);
-	}
-	
-	function NormalRelated() {
-		$return = new DataObjectSet();
-		$links = DataObject::get('RelatedPageLink', 'MasterPageID = ' . $this->owner->ID);
-		if($links) foreach($links as $link) {
-			if($link->RelatedPage()->exists()) {
-				$return->push($link->RelatedPage());
-			}
-		}
-		
-		return $return->Count() > 0 ? $return : false;
-	}
-	
-	function alternateSiteConfig() {
-		$sc = DataObject::get_one('SiteConfig', 'SubsiteID = ' . $this->owner->SubsiteID);
-		if(!$sc) {
-			$sc = new SiteConfig();
-			$sc->SubsiteID = $this->owner->SubsiteID;
-			$sc->Title = 'Your Site Name';
-			$sc->Tagline = 'your tagline here';
-			$sc->write();
-		}
-		return $sc;
-	}
-	
 	/**
 	 * Only allow editing of a page if the member satisfies one of the following conditions:
 	 * - Is in a group which has access to the subsite this page belongs to
@@ -406,14 +369,6 @@ class SiteTreeSubsites extends SiteTreeDecorator {
 		}
 		return $url;
 	}
-
-	
-	/**
-	 * Return a piece of text to keep DataObject cache keys appropriately specific
-	 */
-	function cacheKeyComponent() {
-		return 'subsite-'.Subsite::currentSubsiteID();
-	}
 	
 	function augmentSyncLinkTracking() {
 		// Set LinkTracking appropriately
diff --git a/code/SubsiteReportWrapper.php b/code/SubsiteReportWrapper.php
index d05d015..e05fe47 100644
--- a/code/SubsiteReportWrapper.php
+++ b/code/SubsiteReportWrapper.php
@@ -4,7 +4,7 @@
  * Creates a subsite-aware version of another report.
  * Pass another report (or its classname) into the constructor.
  */
-class SubsiteReportWrapper extends SSReportWrapper {
+class SubsiteReportWrapper extends SS_ReportWrapper {
 	///////////////////////////////////////////////////////////////////////////////////////////
 	// Filtering