mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '3'
This commit is contained in:
commit
3a395e6d56
@ -534,6 +534,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
return $id;
|
||||
}
|
||||
else if($id && is_numeric($id)) {
|
||||
$currentStage = Versioned::get_reading_mode();
|
||||
|
||||
if($this->getRequest()->getVar('Version')) {
|
||||
$versionID = (int) $this->getRequest()->getVar('Version');
|
||||
}
|
||||
@ -551,7 +553,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
singleton($treeClass)->flushCache();
|
||||
|
||||
$record = DataObject::get_by_id($treeClass, $id);
|
||||
if($record) Versioned::set_reading_mode('');
|
||||
}
|
||||
|
||||
// Then, try getting a deleted record
|
||||
@ -570,6 +571,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
$record = null;
|
||||
}*/
|
||||
|
||||
// Set the reading mode back to what it was.
|
||||
Versioned::set_reading_mode($currentStage);
|
||||
|
||||
return $record;
|
||||
|
||||
} else if(substr($id,0,3) == 'new') {
|
||||
|
Loading…
Reference in New Issue
Block a user