Merge remote-tracking branch 'origin/3.0'

code/controllers/CMSSettingsController.php

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

code/model/SiteTree.php

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

javascript/SiteTreeURLSegmentField.js

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