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 remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-04 04:28:21 +13:00
commit 3cb30a9319
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/CMSSettingsController.php
View File

@ -6,7 +6,8 @@ class CMSSettingsController extends LeftAndMain {
static $menu_priority = -1; static $menu_priority = -1;
static $menu_title = 'Settings'; static $menu_title = 'Settings';
static $tree_class = 'SiteConfig'; static $tree_class = 'SiteConfig';
static $required_permission_codes = array('EDIT_SITECONFIG');
public function getResponseNegotiator() { public function getResponseNegotiator() {
$neg = parent::getResponseNegotiator(); $neg = parent::getResponseNegotiator();
$controller = $this; $controller = $this;

3
code/model/SiteTree.php
View File

@ -1569,8 +1569,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$votes = $this->extend('augmentValidURLSegment'); $votes = $this->extend('augmentValidURLSegment');
if($votes) { if($votes) {
$votes = array_filter((array)$votes, 'is_null'); return min($votes);
if($votes) return min($votes);
} }
return true; return true;

2
javascript/SiteTreeURLSegmentField.js
View File

@ -5,7 +5,7 @@
* *
* Input validation on the URLSegment field * Input validation on the URLSegment field
*/ */
$('.field.urlsegment').entwine({ $('.field.urlsegment:not(.readonly)').entwine({
/** /**
* Constructor: onmatch * Constructor: onmatch