Merge branch '3.7' into 3

code/model/SiteTree.php

@@ -2247,9 +2247,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		);
 
 		// "readonly"/viewing version that isn't the current version of the record
-		$stageOrLiveRecord = Versioned::get_one_by_stage($this->class, Versioned::current_stage(), array(
-			'"SiteTree"."ID"' => $this->ID
-		));
+        $stageOrLiveRecord = SiteTree::get()->byID($this->ID);
 		if($stageOrLiveRecord && $stageOrLiveRecord->Version != $this->Version) {
 			$moreOptions->push(FormAction::create('email', _t('CMSMain.EMAIL', 'Email')));
 			$moreOptions->push(FormAction::create('rollback', _t('CMSMain.ROLLBACK', 'Roll back to this version')));

composer.json

@@ -4,7 +4,10 @@
     "description": "The SilverStripe Content Management System",
     "homepage": "http://silverstripe.org",
     "license": "BSD-3-Clause",
-	"keywords": ["silverstripe", "cms"],
+    "keywords": [
+        "silverstripe",
+        "cms"
+    ],
     "authors": [
         {
             "name": "SilverStripe",
@@ -25,8 +28,12 @@
     "require-dev": {
         "phpunit/phpunit": "^3 || ^4 || ^5"
     },
+    "extra": [],
     "autoload": {
-		"classmap": ["tests/behat/", "code"]
+        "classmap": [
+            "tests/behat/",
+            "code"
+        ]
     },
     "minimum-stability": "dev"
 }