From 1dc94570480ddd15ee5232af538b3b7b306343c0 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 4 Jul 2011 16:36:24 +0200 Subject: [PATCH] MINOR Using LeftAndMain->BaseCSSClasses() instead of ViewableData->CSSClasses() to avoid conflicts with customized controller objects (e.g. ModelAdmin_RecordController->edit()) --- admin/code/LeftAndMain.php | 11 +++++++++++ admin/templates/LeftAndMain.ss | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 4e72af237..5b79b4205 100755 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1206,6 +1206,17 @@ class LeftAndMain extends Controller { 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 index 751a35906..c18f953ba 100755 --- a/admin/templates/LeftAndMain.ss +++ b/admin/templates/LeftAndMain.ss @@ -7,7 +7,7 @@ $Title - + <% include CMSLoadingScreen %>