MINOR Using LeftAndMain->BaseCSSClasses() instead of ViewableData->CS…

…SClasses() to avoid conflicts with customized controller objects (e.g. ModelAdmin_RecordController->edit())
silverstripe · Jul 8, 2011 · 1dc9457 · 1dc9457
1 parent 2e9ea1d
commit 1dc9457
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -1206,6 +1206,17 @@ function MceRoot() {
 		return MCE_ROOT;
 	}
 
+	/**
+	 * Same as {@link ViewableData->CSSClasses()}, but with a changed name
+	 * to avoid problems when using {@link ViewableData->customise()}
+	 * (which always returns "ArrayData" from the $original object).
+	 * 
+	 * @return String
+	 */
+	function BaseCSSClasses() {
+		return $this->CSSClasses();
+	}
+
 	function IsPreviewExpanded() {
 		return ($this->request->getVar('cms-preview-expanded'));
 	}

diff --git a/admin/templates/LeftAndMain.ss b/admin/templates/LeftAndMain.ss
@@ -7,7 +7,7 @@
 <title>$Title</title>
 </head>
 
-<body class="loading cms $CSSClasses">
+<body class="loading cms $BaseCSSClasses">
 
 	<% include CMSLoadingScreen %>