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 '5.2' into 5.3

Browse Source
This commit is contained in:
github-actions 2024-09-12 20:57:24 +00:00
commit 5ba2f640c5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Model/SiteTree.php
View File

@ -301,6 +301,15 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
"Stage", "Live"
];
/**
* Fields which, if changed on their own, won't cause a new version/live record to be created
* @var string[]
*/
private static array $fields_ignored_by_versioning = [
'HasBrokenFile',
'HasBrokenLink',
];
private static $default_sort = "\"Sort\"";
/**
@ -1600,7 +1609,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
if (!SiteTree::get_by_link($defaultHomepage)) {
$homepage = new Page();
$homepage->Title = _t(__CLASS__.'.DEFAULTHOMETITLE', 'Home');
$homepage->Content = _t(__CLASS__.'.DEFAULTHOMECONTENT', '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>You can now access the <a href="http://docs.silverstripe.org">developer documentation</a>, or begin the <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lessons</a>.</p>');
$homepage->Content = _t(__CLASS__.'.DEFAULTHOMECONTENT2', '<p>Welcome to Silverstripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>For comprehensive information on Silverstripe CMS, see the <a target="_blank" href="http://docs.silverstripe.org">developer documentation</a>.</p>');
$homepage->URLSegment = $defaultHomepage;
$homepage->Sort = 1;
$homepage->write();
@ -1693,7 +1702,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
}
// Check to see if we've only altered fields that shouldn't affect versioning
$fieldsIgnoredByVersioning = ['HasBrokenLink', 'Status', 'HasBrokenFile', 'ToDo', 'VersionID', 'SaveCount'];
$fieldsIgnoredByVersioning = $this->config()->get('fields_ignored_by_versioning') ?? [];
$changedFields = array_keys($this->getChangedFields(true, 2) ?? []);
// This more rigorous check is inline with the test that write() does to decide whether or not to write to the

1
lang/en.yml
View File

@ -195,6 +195,7 @@ en:
DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.</p>'
DEFAULTCONTACTTITLE: 'Contact Us'
DEFAULTHOMECONTENT: '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>You can now access the <a href="http://docs.silverstripe.org">developer documentation</a>, or begin the <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lessons</a>.</p>'
DEFAULTHOMECONTENT2: '<p>Welcome to Silverstripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>For comprehensive information on Silverstripe CMS, see the <a target="_blank" href="http://docs.silverstripe.org">developer documentation</a>.</p>'
DEFAULTHOMETITLE: Home
DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
DESCRIPTION: 'Generic content page'