Fixing more statics that weren't private, and nested_urls deprecated …

…usage
antons- · May 6, 2013 · 306cb79 · 306cb79
1 parent 8ffeeb1
commit 306cb79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/code/SubsiteAdmin.php b/code/SubsiteAdmin.php
@@ -6,14 +6,15 @@
  */
 class SubsiteAdmin extends ModelAdmin {
 
-	static $managed_models = array('Subsite');
-	static $url_segment = 'subsites';
+	private static $managed_models = array('Subsite');
+
+	private static $url_segment = 'subsites';
 
-	static $menu_title = "Subsites";
+	private static $menu_title = "Subsites";
 
 	public $showImportForm=false;
 
-	static $tree_class = 'Subsite';
+	private static $tree_class = 'Subsite';
 
 	public function getEditForm($id = null, $fields = null) {
 		$form = parent::getEditForm($id, $fields);

diff --git a/code/SubsitesVirtualPage.php b/code/SubsitesVirtualPage.php
@@ -122,7 +122,7 @@ public function validURLSegment() {
 			$IDFilter = ($this->ID) ? "AND \"SiteTree\".\"ID\" <> $this->ID" :  null;
 			$parentFilter = null;
 
-			if(self::nested_urls()) {
+			if(Config::inst()->get('SiteTree', 'nested_urls')) {
 				if($this->ParentID) {
 					$parentFilter = " AND \"SiteTree\".\"ParentID\" = $this->ParentID";
 				} else {

diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
@@ -90,11 +90,12 @@ function updateCMSFields(FieldList $fields) {
 
 		// replace readonly link prefix
 		$subsite = $this->owner->Subsite();
+		$nested_urls_enabled = Config::inst()->get('SiteTree', 'nested_urls');
 		if($subsite && $subsite->ID) {
 			$baseUrl = 'http://' . $subsite->domain() . '/';
 			$baseLink = Controller::join_links (
 				$baseUrl,
-				(SiteTree::nested_urls() && $this->owner->ParentID ? $this->owner->Parent()->RelativeLink(true) : null)
+				($nested_urls_enabled && $this->owner->ParentID ? $this->owner->Parent()->RelativeLink(true) : null)
 			);
 
 			$url = (strlen($baseLink) > 36 ? "..." .substr($baseLink, -32) : $baseLink);