mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
BUGFIX: Fixed bugs in content differencer, and improved styling. BUGFIX: fixed notice when getting title of member which didnt exist. Merged from trunk r77661. (from r81942)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90845 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
84a33b440a
commit
bb87f843ca
@ -809,7 +809,6 @@ JS;
|
|||||||
|
|
||||||
if($record) {
|
if($record) {
|
||||||
if($record && !$record->canView()) return Security::permissionFailure($this);
|
if($record && !$record->canView()) return Security::permissionFailure($this);
|
||||||
|
|
||||||
$fields = $record->getCMSFields($this);
|
$fields = $record->getCMSFields($this);
|
||||||
$fields->removeByName("Status");
|
$fields->removeByName("Status");
|
||||||
|
|
||||||
@ -817,6 +816,7 @@ JS;
|
|||||||
$fields->push(new HiddenField("Version"));
|
$fields->push(new HiddenField("Version"));
|
||||||
|
|
||||||
$versionAuthor = DataObject::get_by_id('Member', $record->AuthorID);
|
$versionAuthor = DataObject::get_by_id('Member', $record->AuthorID);
|
||||||
|
if(!$versionAuthor) $versionAuthor = new ArrayData(array('Title' => 'Unknown author'));
|
||||||
$fields->insertBefore(
|
$fields->insertBefore(
|
||||||
new LiteralField(
|
new LiteralField(
|
||||||
'YouAreViewingHeader',
|
'YouAreViewingHeader',
|
||||||
|
Loading…
Reference in New Issue
Block a user