tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: moved $versionAuthor variable invocation into a check for the existence of the $record variable on which it depends (Ticket #4458)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85713 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Julian Seidenberg 2009-09-04 01:18:07 +00:00
parent cbaa5840c3
commit d60fc2fdce
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/CMSMain.php
View File

@ -755,8 +755,7 @@ JS;
$id = $this->urlParams['ID']; $id = $this->urlParams['ID'];
$version = str_replace('&ajax=1','',$this->urlParams['OtherID']); $version = str_replace('&ajax=1','',$this->urlParams['OtherID']);
$record = Versioned::get_version("SiteTree", $id, $version); $record = Versioned::get_version("SiteTree", $id, $version);
$versionAuthor = DataObject::get_by_id('Member', $record->AuthorID);
if($record) { if($record) {
if($record && !$record->canView()) return Security::permissionFailure($this); if($record && !$record->canView()) return Security::permissionFailure($this);
@ -765,6 +764,8 @@ JS;
$fields->push(new HiddenField("ID")); $fields->push(new HiddenField("ID"));
$fields->push(new HiddenField("Version")); $fields->push(new HiddenField("Version"));
$versionAuthor = DataObject::get_by_id('Member', $record->AuthorID);
$fields->insertBefore( $fields->insertBefore(
new LiteralField( new LiteralField(
'YouAreViewingHeader', 'YouAreViewingHeader',