BUGFIX prevent calling function on null record

silverstripe · Oct 29, 2011 · c34ef60 · c34ef60
1 parent f634ad0
commit c34ef60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/code/controllers/CMSPageHistoryController.php b/code/controllers/CMSPageHistoryController.php
@@ -27,7 +27,8 @@ function show($request) {
 		$form = $this->ShowVersionForm(
 			$request->param('VersionID')
 		);
-		if($this->isAjax()) {
+
+		if($form && $this->isAjax()) {
 				$content = $form->forTemplate();
 		} else {
 			$content = $this->customise(array('EditForm' => $form))->renderWith($this->getViewer('show'));

diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
@@ -20,11 +20,10 @@
 		</div>
 	</div>
 
-	<div class="cms-content-tools west cms-panel" data-expandOnClick="true">
-
-		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+	<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
+		<div class="cms-panel-content center">
+			<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 
-		<div class="cms-panel-content">
 			$SearchForm
 		</div>
 	</div>