Merge branch '3.4' into 3

silverstripe · Jul 12, 2016 · 00d16ec · 00d16ec
2 parents 3c00110 + a2657b5
commit 00d16ec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
@@ -545,6 +545,8 @@ public function getRecord($id, $versionID = null) {
 			return $id;
 		}
 		else if($id && is_numeric($id)) {
+			$currentStage = Versioned::get_reading_mode();
+
 			if($this->getRequest()->getVar('Version')) {
 				$versionID = (int) $this->getRequest()->getVar('Version');
 			}
@@ -562,7 +564,6 @@ public function getRecord($id, $versionID = null) {
 				singleton($treeClass)->flushCache();
 
 				$record = DataObject::get_by_id($treeClass, $id);
-				if($record) Versioned::set_reading_mode('');
 			}
 
 			// Then, try getting a deleted record
@@ -581,6 +582,9 @@ public function getRecord($id, $versionID = null) {
 				$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') {