Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

BUGFIX prevent calling function on null record

  • Loading branch information...
commit c34ef60d8242e8eb517e8aec2ec0b933b414184d 1 parent f634ad0
@wilr wilr authored
View
3  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'));
View
7 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>
Please sign in to comment.
Something went wrong with that request. Please try again.