tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.7' into 3

Browse Source
This commit is contained in:
Robbie Averill 2018-06-22 18:46:34 +12:00
commit 3097bccadc
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/model/SiteTree.php
View File

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

67
composer.json
View File

@ -1,32 +1,39 @@
{ {
"name": "silverstripe/cms", "name": "silverstripe/cms",
"type": "silverstripe-module", "type": "silverstripe-module",
"description": "The SilverStripe Content Management System", "description": "The SilverStripe Content Management System",
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"keywords": ["silverstripe", "cms"], "keywords": [
"authors": [ "silverstripe",
{ "cms"
"name": "SilverStripe", ],
"homepage": "http://silverstripe.com" "authors": [
}, {
{ "name": "SilverStripe",
"name": "The SilverStripe Community", "homepage": "http://silverstripe.com"
"homepage": "http://silverstripe.org" },
} {
], "name": "The SilverStripe Community",
"require": { "homepage": "http://silverstripe.org"
"php": ">=5.3.3", }
"composer/installers": "*", ],
"silverstripe/framework": "~3.4", "require": {
"silverstripe/reports": "~3.4", "php": ">=5.3.3",
"silverstripe/siteconfig": "~3.4" "composer/installers": "*",
}, "silverstripe/framework": "~3.4",
"require-dev": { "silverstripe/reports": "~3.4",
"phpunit/phpunit": "^3 || ^4 || ^5" "silverstripe/siteconfig": "~3.4"
}, },
"autoload": { "require-dev": {
"classmap": ["tests/behat/", "code"] "phpunit/phpunit": "^3 || ^4 || ^5"
}, },
"minimum-stability": "dev" "extra": [],
"autoload": {
"classmap": [
"tests/behat/",
"code"
]
},
"minimum-stability": "dev"
} }