tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 07:59:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.2' into 3.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-07-12 01:07:12 +01:00
commit 118a09afff
No known key found for this signature in database
GPG Key ID: 229831A941962E26
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/CMSMain.php
View File

@ -547,6 +547,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
return $id; return $id;
} }
else if($id && is_numeric($id)) { else if($id && is_numeric($id)) {
$currentStage = Versioned::get_reading_mode();
if($this->getRequest()->getVar('Version')) { if($this->getRequest()->getVar('Version')) {
$versionID = (int) $this->getRequest()->getVar('Version'); $versionID = (int) $this->getRequest()->getVar('Version');
} }
@ -564,7 +566,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
singleton($treeClass)->flushCache(); singleton($treeClass)->flushCache();
$record = DataObject::get_by_id($treeClass, $id); $record = DataObject::get_by_id($treeClass, $id);
if($record) Versioned::set_reading_mode('');
} }
// Then, try getting a deleted record // Then, try getting a deleted record
@ -583,6 +584,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$record = null; $record = null;
}*/ }*/
// Set the reading mode back to what it was.
Versioned::set_reading_mode($currentStage);
return $record; return $record;
} else if(substr($id,0,3) == 'new') { } else if(substr($id,0,3) == 'new') {