Merge 3.3 into 3

Conflicts:
	admin/css/screen.css.map

.travis.yml

@@ -27,23 +27,32 @@ matrix:
       env: DB=MYSQL PDO=1
     - php: 5.6
       env: DB=MYSQL BEHAT_TEST=1
+    - php: 5.6
+      env: DB=MYSQL CMS_TEST=1
+    - php: 5.6
+      env: DB=MYSQL BEHAT_TEST=1 CMS_TEST=1
 
 before_script:
-# Until http://pecl.php.net/package/imagick is working again
+ - if ! [ $(phpenv version-name) = "5.3" ]; then printf "\n" | pecl install imagick; fi
-# - printf "\n" | pecl install imagick
+ - if [ $(phpenv version-name) = "5.3" ]; then printf "\n" | pecl install imagick-3.3.0; fi
  - composer self-update || true
  - phpenv rehash
+ - phpenv config-rm xdebug.ini
  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- - "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ] && [ \"$CMS_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"
+ - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ] && [ \"$CMS_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/cms:$CORE_RELEASE.x-dev; fi"
+ - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension,silverstripe/cms:$CORE_RELEASE.x-dev; fi"
  - cd ~/builds/ss
  - php ~/travis-support/travis_setup_selenium.php --if-env BEHAT_TEST
  - php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
 
 script:
- - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit framework/tests; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/phpunit framework/tests; fi"
- - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit framework/admin/tests; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/phpunit framework/admin/tests; fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @framework; fi"
+ - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/behat @framework; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/phpunit cms/tests; fi"
+ - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
 
 after_failure:
  - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_AWS_SECRET_ACCESS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_S3_BUCKET/

admin/code/LeftAndMain.php

@@ -79,7 +79,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	 * @config
 	 * @var string
 	 */
-	private static $help_link = '//userhelp.silverstripe.org/framework/en/3.2';
+	private static $help_link = '//userhelp.silverstripe.org/framework/en/3.3';
 
 	/**
 	 * @var array

admin/css/ie7.css

@@ -198,7 +198,7 @@ table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; }
 
 .ss-ui-button.ss-gridfield-button-filter { border: none !important; }
 
-/** DEPRECATED: .cms-content-tools will be removed in 4.0 Use .cms-content-filters instead.  Fix for model admin filter styling  */
+/** DEPRECATED: .cms-content-tools will be removed in 4.0 Use .cms-content-filters instead.  Fix for model admin filter styling */
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { overflow: hidden; }
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form input { width: 160px; }
 

admin/css/ie7.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
-"sources": ["../scss/_ieShared.scss","../scss/themes/_default.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/utilities/sprites/_base.scss","../scss/_sprites.scss","../scss/ie7.scss"],
+"sources": ["../scss/themes/_default.scss","../scss/_ieShared.scss","../scss/_sprites.scss","../../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/utilities/sprites/_base.scss","../scss/ie7.scss"],
 "names": [],
 "file": "ie7.css"
 }

admin/css/ie8.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
-"sources": ["../scss/_ieShared.scss","../scss/themes/_default.scss","../scss/ie8.scss"],
+"sources": ["../scss/themes/_default.scss","../scss/_ieShared.scss","../scss/ie8.scss"],
 "names": [],
 "file": "ie8.css"
 }

admin/css/screen.css

@@ -236,7 +236,7 @@ body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif;
 .ui-accordion .ui-accordion-content { border: 1px solid #d0d3d5; border-top: none; }
 
 .ui-autocomplete { max-height: 240px; overflow-x: hidden; overflow-y: auto; /** sorry about the !important but the specificity of other selectors mandates it over writing out very specific selectors **/ }
-.ui-autocomplete .loading { background-image: url(../images/throbber.gif) !important; background-position: 97% center !important; background-repeat: no-repeat !important; background-size: auto !important; }
+.ui-autocomplete-loading { background-image: url(../images/throbber.gif) !important; background-position: 97% center !important; background-repeat: no-repeat !important; background-size: auto !important; }
 
 /** This file defines common styles for form elements used throughout the CMS interface. It is an addition to the base styles defined in framework/css/Form.css.  @package framework @subpackage admin */
 /** ---------------------------------------------------- Basic form fields ---------------------------------------------------- */
@@ -487,15 +487,15 @@ fieldset.switch-states.size_5 input:checked:nth-of-type(5) ~ .slide-button { lef
 .cms-panel .cms-content-filters .Actions { margin-bottom: 0; }
 
 /**
-* This file defines most styles of the CMS: Colors, fonts, backgrounds, 
+* This file defines most styles of the CMS: Colors, fonts, backgrounds,
 * alignments, dimensions.
-* 
+*
-* Use SCSS variable definitions in screen.css to avoid repeating styles 
+* Use SCSS variable definitions in screen.css to avoid repeating styles
-* like background colours or padding dimensions. See themes/_default.scss 
+* like background colours or padding dimensions. See themes/_default.scss
 * to get started.
-* 
+*
-* To avoid this file getting too large and complicated, it is encouraged to 
+* To avoid this file getting too large and complicated, it is encouraged to
-* create new SCSS files for larger components like the CMS menu or tree 
+* create new SCSS files for larger components like the CMS menu or tree
 * (see _tree.scss and _menu.scss).
 */
 /** ---------------------------------------------------- Core Styles. ---------------------------------------------------- */
@@ -604,11 +604,12 @@ body.cms { overflow: hidden; }
 .ui-tabs .ui-tabs-nav li:active { outline: none; }
 .ui-tabs .ui-tabs-nav li a { display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; outline: none; float: none; font-weight: normal; color: #4f5861; line-height: 32px; padding: 0 12px 0; }
 .ui-tabs .ui-tabs-nav li:last-child { margin-right: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-state-default, .ui-tabs .ui-tabs-nav li.ui-state-active { margin-bottom: -1px; padding-bottom: 0; }
 .ui-tabs .ui-tabs-nav .ui-state-default { border: 0; background: transparent; }
-.ui-tabs .ui-tabs-nav .ui-state-default a { line-height: 28px; padding-top: 12px; padding-bottom: 8px; color: #66727d; }
+.ui-tabs .ui-tabs-nav .ui-state-default a { line-height: 28px; padding-top: 12px; padding-bottom: 5px; color: #66727d; border-bottom: 3px solid transparent; }
 .ui-tabs .ui-tabs-nav .ui-state-default a:hover { color: #4f5861; }
-.ui-tabs .ui-tabs-nav .ui-state-active { padding-bottom: 1px; background-color: transparent; cursor: text; }
+.ui-tabs .ui-tabs-nav .ui-state-active { background-color: transparent; cursor: text; }
-.ui-tabs .ui-tabs-nav .ui-state-active a { border-bottom: 3px solid #66727d; padding-left: 0; padding-right: 0; margin: 0 12px 0; color: #4f5861; }
+.ui-tabs .ui-tabs-nav .ui-state-active a { border-color: #66727d; padding-left: 0; padding-right: 0; margin: 0 12px 0; color: #4f5861; }
 .ui-tabs .ui-tabs-nav.ui-state-active { border-color: #808080; }
 .ui-tabs .ui-tabs-nav li.cms-tabset-icon.ui-corner-top { text-indent: -9999em; }
 .ui-tabs .ui-tabs-nav li.cms-tabset-icon.ui-corner-top a { display: block; padding-left: 40px; padding-right: 0; margin: 0; }
@@ -641,8 +642,7 @@ body.cms { overflow: hidden; }
 .cms-content-header-tabs .icon-button-group { margin-right: 16px; }
 
 .cms-content-fields .ui-tabs-nav { float: none; padding: 0; border-bottom: 1px solid #d0d3d5; margin: 0 16px 0; }
-.cms-content-fields .ui-tabs-nav li { margin-bottom: -1px; }
+.cms-content-fields .ui-tabs-nav li { margin: 0 12px -1px -12px; }
-.cms-content-fields .ui-tabs-nav li.first a { margin-left: 0; padding-left: 0; }
 
 /** ------------------------------------------------------- Loading Interface ------------------------------------------------------- */
 .cms-content-loading-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9998; }
@@ -733,7 +733,7 @@ body.cms { overflow: hidden; }
 .cms-content-tools h3 { font-size: 13px; }
 .cms-content-tools h4 { font-size: 12px; margin: 5px 0; }
 .cms-content-tools .ui-widget-content { background: none; }
-.cms-content-tools .field { /*  Fields are more compressed in the sidebar compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ }
+.cms-content-tools .field { /* Fields are more compressed in the sidebar compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ }
 .cms-content-tools .field label { float: none; width: auto; font-size: 12px; padding: 0 8px 4px 0; }
 .cms-content-tools .field .middleColumn { margin: 0; }
 .cms-content-tools .field input.text, .cms-content-tools .field select, .cms-content-tools .field textarea { padding: 5px; font-size: 11px; }
@@ -758,7 +758,7 @@ body.cms { overflow: hidden; }
 .cms-tree-filtered { position: absolute; margin: 0; width: 100%; box-sizing: border-box; margin-left: -16px; padding: 16px 16px; background: #D4E2EC; text-shadow: none; border: 0; }
 .cms-tree-filtered > strong, .cms-tree-filtered > a { font-size: 14px; }
 
-/**  CMS Batch actions */
+/** CMS Batch actions */
 .cms-content-batchactions-button { display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; padding: 4px 6px; vertical-align: middle; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(to bottom, #ffffff, #d9d9d9); border: 1px solid #aaa; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
 
 .cms-content-batchactions { float: left; position: relative; display: block; }
@@ -844,7 +844,7 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
 
 /** ------------------------------------------------------------------
 * Dialog
-* 
+*
 * Contained in a jQuery UI dialog ('.ui-dialog'), with either inline
 * markup (for the "insert" dialogs), or an iframe (for member profile).
 * ----------------------------------------------------------------- */
@@ -960,7 +960,7 @@ form.import-form label.left { width: 250px; }
 .toggle-details-icon.opened { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 -846px no-repeat; }
 .ss-uploadfield-item-edit-all .toggle-details-icon.opened { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 -814px no-repeat; }
 
-/** -------------------------------------------- Hide preview toggle link by default. May be shown  in IE7 stylesheet and forced to show with js if needed -------------------------------------------- */
+/** -------------------------------------------- Hide preview toggle link by default. May be shown in IE7 stylesheet and forced to show with js if needed -------------------------------------------- */
 .cms .Actions > .cms-preview-toggle-link, .cms .cms-navigator > .cms-preview-toggle-link { display: none; }
 
 /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file).  The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */

admin/javascript/LeftAndMain.js

@@ -179,7 +179,7 @@ jQuery.noConflict();
 			var msg = (xhr.getResponseHeader('X-Status')) ? xhr.getResponseHeader('X-Status') : xhr.statusText,
 				reathenticate = xhr.getResponseHeader('X-Reauthenticate'),
 				msgType = (xhr.status < 200 || xhr.status > 399) ? 'bad' : 'good',
-				ignoredMessages = ['OK'];
+				ignoredMessages = ['OK', 'success'];
 
 			// Enable reauthenticate dialog if requested
 			if(reathenticate) {
@@ -914,8 +914,11 @@ jQuery.noConflict();
 					sessionStates = sessionData ? JSON.parse(sessionData) : false;
 
 				this.find('.cms-tabset, .ss-tabset').each(function() {
-					var index, tabset = $(this), tabsetId = tabset.attr('id'), tab,
+					var index, 
-						forcedTab = tabset.find('.ss-tabs-force-active');
+						tabset = $(this), 
+						tabsetId = tabset.attr('id'), 
+						tab,
+						forcedTab = tabset.children('ul').children('li.ss-tabs-force-active');
 
 					if(!tabset.data('tabs')){
 						return; // don't act on uninit'ed controls
@@ -924,18 +927,18 @@ jQuery.noConflict();
 					// The tabs may have changed, notify the widget that it should update its internal state.
 					tabset.tabs('refresh');
 
-					// Make sure the intended tab is selected.
+					// Make sure the intended tab is selected. Only force the tab on the correct tabset though
 					if(forcedTab.length) {
-						index = forcedTab.index();
+						index = forcedTab.first().index();
 					} else if(overrideStates && overrideStates[tabsetId]) {
 						tab = tabset.find(overrideStates[tabsetId].tabSelector);
 						if(tab.length){
 							index = tab.index();
 						}
 					} else if(sessionStates) {
-						$.each(sessionStates, function(i, sessionState) {
+						$.each(sessionStates, function(i, state) {
-							if(tabset.is('#' + sessionState.id)){
+							if(tabsetId == state.id){
-								index = sessionState.selected;
+								index = state.selected;
 							}
 						});
 					}

admin/scss/_style.scss

@@ -1,13 +1,13 @@
  /**
- * This file defines most styles of the CMS: Colors, fonts, backgrounds, 
+ * This file defines most styles of the CMS: Colors, fonts, backgrounds,
  * alignments, dimensions.
- * 
+ *
- * Use SCSS variable definitions in screen.css to avoid repeating styles 
+ * Use SCSS variable definitions in screen.css to avoid repeating styles
- * like background colours or padding dimensions. See themes/_default.scss 
+ * like background colours or padding dimensions. See themes/_default.scss
  * to get started.
- * 
+ *
- * To avoid this file getting too large and complicated, it is encouraged to 
+ * To avoid this file getting too large and complicated, it is encouraged to
- * create new SCSS files for larger components like the CMS menu or tree 
+ * create new SCSS files for larger components like the CMS menu or tree
  * (see _tree.scss and _menu.scss).
  */
 @import "compass";
@@ -33,18 +33,18 @@ body.cms {
 	a {
 		color: $color-text-blue-link;
 		text-decoration: none;
-	
+
 		&:hover,
 		&:focus {
 			text-decoration: underline;
 		}
 	}
-	
+
 	body .ui-widget {
 		font-family: $font-family;
 		font-size: $font-base-size;
 	}
-	
+
 	strong {
 		font-weight: bold;
 	}
@@ -108,7 +108,7 @@ body.cms {
 	a {
 		color: $color-text-blue-link;
 	}
-	
+
 	.backlink {
 		span.btn-icon-back {
 			height:16px;
@@ -159,7 +159,7 @@ body.cms {
 			}
 		}
 	}
-	
+
 	// Reset to default styles
 	.ss-ui-button {
 		line-height: $grid-x*3;
@@ -255,7 +255,7 @@ body.cms {
 	.view-controls {
 		float: right;
 		margin-top: 4px;
-		
+
 		.icon-button-group {
 			.icon-button {
 				padding: 6px 8px;
@@ -365,7 +365,7 @@ body.cms {
 		&:active {
 			background-color: #d4dbe1;
 		}
-		
+
 		&.font-icon-search {
 			&:before {
 				font-size: 18px;
@@ -385,7 +385,7 @@ body.cms {
 }
 
 // Context specific overrides for Tabs.
-.ui-tabs.ui-tabs-nav li.cms-tabset-icon.ui-corner-top.ui-state-active a.icon-button.cms-panel-link, 
+.ui-tabs.ui-tabs-nav li.cms-tabset-icon.ui-corner-top.ui-state-active a.icon-button.cms-panel-link,
 .ui-tabs.ui-tabs-nav li.cms-tabset-icon.ui-corner-top.ui-state-default a.icon-button.cms-panel-link {
 	padding: 5px 8px 6px;
 	line-height: 1em;
@@ -466,7 +466,7 @@ body.cms {
 			box-shadow: inset 0 0 3px rgba(191, 194, 196, .9);
 		}
 	}
-	
+
 	.cms-content-header-tabs & {
 		overflow: hidden;
 	}
@@ -508,16 +508,16 @@ body.cms {
 		~ .ui-tabs-panel {
 			clear: both;
 		}
-		
+
 		li {
 			top: 0;
 			float: left;
 			margin-top: 0;
-			
+
 			&:active {
 				outline: none;
 			}
-		
+
 			a {
 				@include inline-block;
 				outline: none;
@@ -538,6 +538,14 @@ body.cms {
 			}
 		}
 
+		//jquery UI override
+		li.ui-tabs-active,
+		li.ui-state-default,
+		li.ui-state-active {
+			margin-bottom: -1px;
+			padding-bottom: 0;
+		}
+
 		.ui-state-default {
 			border: 0;
 			background: transparent;
@@ -545,8 +553,9 @@ body.cms {
 			a {
 				line-height: 28px;
 				padding-top: 12px;
-				padding-bottom: 8px;
+				padding-bottom: 5px;
 				color: lighten($color-text, 10%);
+				border-bottom: 3px solid transparent;
 
 				&:hover {
 					color: $color-text;
@@ -555,19 +564,18 @@ body.cms {
 		}
 
 		.ui-state-active {
-			padding-bottom: 1px;
 			background-color: transparent;
 			cursor: text;
 
 			a {
-				border-bottom: 3px solid #66727d;
+				border-color: #66727d;
 				padding-left: 0;
 				padding-right: 0;
 				margin: 0 12px 0;
 				color: $color-text;
 			}
 		}
-		
+
 		&.ui-state-active {
 			border-color: $color-medium-separator;
 		}
@@ -619,8 +627,8 @@ body.cms {
  * Primary styles which sit on top of screen, with different tab colors.
  * TODO Only use one "primary" selector and fix HTMLEditorField TabSet addExtraClass()
  */
-.ui-tabs.cms-tabset-primary .ui-tabs-nav, 
+.ui-tabs.cms-tabset-primary .ui-tabs-nav,
-.ui-tabs .ui-tabs-nav.cms-tabset-nav-primary, 
+.ui-tabs .ui-tabs-nav.cms-tabset-nav-primary,
 .ui-tabs .cms-content-header-tabs .ui-tabs-nav {
 	margin-top: 0;
 	float: none; // parent container is already right floated
@@ -643,13 +651,13 @@ body.cms {
 
 	.ui-state-default {
 		background: none;
-		border-top: none;			
+		border-top: none;
 		border: none;
 	}
-		
+
 	.ui-state-active {
 		@include box-shadow(none);
-		background: transparent;	
+		background: transparent;
 		border-top: none;
 		border: none;
 		z-index:2;
@@ -665,7 +673,7 @@ body.cms {
 .cms-content-header-tabs {
 	float: right;
 	margin-top: 8px;
-	
+
 	&.icon-button-group-tabs {
 		margin-top: 12px;
 		margin-bottom: 13px;
@@ -683,12 +691,8 @@ body.cms {
 	margin: 0 16px 0;
 
 	li {
-		margin-bottom: -1px;
+		// Align tab content with gutter (supports multiple rows of tabs)
-
+		margin: 0 $grid-x*1.5 -1px $grid-x*-1.5;
-		&.first a {
-			margin-left: 0;
-			padding-left: 0;
-		}
 	}
 }
 
@@ -744,7 +748,7 @@ body.cms {
 		position: absolute;
 		bottom: 80px;
 		z-index: 100001;
-		
+
 		span.notice {
 			width: 300px;
 			font-size: 14px;
@@ -758,7 +762,7 @@ body.cms {
       		*display: inline;
 		}
 	}
-	
+
 	.loading-animation {
 		display: none;
 		position: absolute;
@@ -791,16 +795,16 @@ body.cms {
 	clear: both;
 	margin: 0 0 $grid-y;
 	padding: $grid-y + $grid-x/4 $grid-x + $grid-x/2;
-	font-weight: normal;	
+	font-weight: normal;
 	border: 1px #ccc solid;
 	background: #fff;									// for browsers that don't understand rgba
 	background: rgba(#fff,0.5);
 	text-shadow: none;
 	@include border-radius(3px 3px 3px 3px);
 
-	&.notice {		
+	&.notice {
 		background-color: lighten($color-notice,22%);	// Blue
-		border-color: $color-notice;	
+		border-color: $color-notice;
 	}
 	&.warning {											// Yellow
 		background-color: lighten($color-warning,47%);
@@ -809,12 +813,12 @@ body.cms {
 	&.error, &.bad, &.required, &.validation {			// Red
 		background-color: lighten($color-error,24%);
 		border-color: $color-error;
-	}	
+	}
 	&.good {											// Green
 		background-color: lighten($color-good,40%);
 		border-color: $color-good;
 	}
-	
+
 	p {
 		margin: 0;
 	}
@@ -828,15 +832,15 @@ body.cms {
 	.ui-tabs-panel {
 		.message {
 			margin: $grid-x*2 0; // gets padding from tab panel
-		}	
+		}
 	}
 }
 
 
 .notice-item {
 	@include border-radius(3px);
-	font-family: inherit; 
+	font-family: inherit;
-	font-size: inherit; 
+	font-size: inherit;
 	padding: 6px 24px 8px 10px;
 	word-wrap: break-word;
 	min-height: 60px;
@@ -880,7 +884,7 @@ body.cms {
 	font-weight: normal;
 	width: 12px;
 	height: 16px;
-	color: #555; 
+	color: #555;
 	font-size: 16px;
 	overflow: hidden;
 	top: 4px;
@@ -938,14 +942,14 @@ body.cms {
 	.step-label {
 		opacity:0.9;
 		.flyout {
-			height:17px; //centres number within the grey arrow 
+			height:17px; //centres number within the grey arrow
 			padding-top:5px;
 		}
 		.title {
 			padding-top:5px; //aligns label with point of arrow
 			font-weight:bold; //to match pagetype label
 			@include text-shadow(1px 1px 0 $color-text-shadow);
-		}		
+		}
 	}
 	ul.SelectionGroup {
 		padding-left:28px;
@@ -955,7 +959,7 @@ body.cms {
 	.parent-mode {
 		padding: $grid-x;
 		overflow: auto;
-	}	
+	}
 }
 
 #PageType {
@@ -974,14 +978,14 @@ body.cms {
 			&:last-child {
 				border-bottom: none;
 			}
-					
+
 			&:hover, &.selected {
 				background-color: $color-highlight-opacity;
 			}
 
 			&.disabled {
 				color: $color-text-disabled;
-				
+
 				@include opacity(0.5);
 
 				&:hover {
@@ -997,22 +1001,22 @@ body.cms {
 				padding-left: 0;
 				padding-bottom: 0;
 			}
-			
+
 			input, label, .page-icon, .title {
 				float: left;
 				line-height: 1.3em;
 			}
-			
+
 			.page-icon {
 				margin: 0 4px;
 			}
-			
+
 			.title {
 				width: 120px;
 				font-weight: bold;
 				padding-right: 10px;
 			}
-			
+
 			.description {
 				font-style: italic;
 				// Undo some generic styles from tooltips
@@ -1021,8 +1025,8 @@ body.cms {
 				margin: 0;
 			}
 		}
-	}	
+	}
-}	
+}
 
 /** --------------------------------------------
  * Content toolbar
@@ -1036,7 +1040,7 @@ body.cms {
 	@include legacy-pie-clearfix();
 	border-bottom: 0;
 	box-shadow: none;
-	
+
 	.cms-tree-view-modes {
 		float:right;
 		padding-top:$grid-y - 3;
@@ -1068,7 +1072,7 @@ body.cms {
 .cms-content-tools {
 	background: $tab-panel-texture-color;
 	width: $grid-x * 36;
-	overflow-y: auto;	
+	overflow-y: auto;
 	overflow-x: hidden;
 	z-index: 70;
 	border-right: 1px solid $color-separator;
@@ -1078,7 +1082,7 @@ body.cms {
 	&.filter{
 		padding:0 !important;
 	}
-	
+
 	.cms-panel-header {
 		clear: both;
 		margin: 10px 0 $grid-y - 1;
@@ -1086,7 +1090,7 @@ body.cms {
 		line-height: $grid-y * 3;
 		border-bottom: 1px solid $color-light-separator;
 	}
-	
+
 	.cms-panel-content {
 		width: $grid-x * 34;
 		padding: 0 $grid-x*1.5 0 $grid-x*2;
@@ -1097,9 +1101,9 @@ body.cms {
 			margin-right:5px; //accounts for the scrollbar in the filter - keeps the actions on one line instead of wrapping onto two.
 		}
 	}
-	
+
 	.cms-content-header {
-		background-color: darken($color-widget-bg, 40%);	
+		background-color: darken($color-widget-bg, 40%);
 		@include background-image(
 			linear-gradient(darken($color-widget-bg, 20%), darken($color-widget-bg, 40%))
 		);
@@ -1124,13 +1128,13 @@ body.cms {
 		font-size: $font-base-size;
 		margin:5px 0;
 	}
-	
+
 	.ui-widget-content {
 		background: none;
 	}
-	
+
 	.field {
-		/* 
+		/*
 		 * Fields are more compressed in the sidebar compared to the
 		 * main content editing window so the below alters the internal
 		 * spacing of the fields so we can move that spacing to between
@@ -1142,23 +1146,23 @@ body.cms {
 			font-size: $font-base-size;
 			padding: 0 $grid-x 4px 0;
 		}
-		
+
 		.middleColumn {
 			margin: 0;
 		}
-		
+
 		input.text,
 		select,
 		textarea {
 			padding: 5px;
 			font-size: 11px;
 		}
-		
+
 		&.checkbox {
 			padding: 0 0 8px;
-			
+
-			input { 
+			input {
-				margin: 2px 0; 
+				margin: 2px 0;
 			}
 		}
 
@@ -1170,14 +1174,14 @@ body.cms {
 	.fieldgroup {
 		.fieldgroup-field {
 			padding: 0;
-			
+
 			.field {
 				margin: 0;
 				padding: 0;
 			}
 		}
 	}
-	
+
 	table {
 		margin: 8px -4px;
 		thead {
@@ -1189,7 +1193,7 @@ body.cms {
 				padding: 4px;
 			}
 		}
-		
+
 		tr {
 			&.active {
 				background-color: $color-menu-button;
@@ -1203,14 +1207,14 @@ body.cms {
 				}
 			}
 		}
-		
+
 		td {
 			padding: 4px;
 			line-height: 16px;
 			vertical-align: top;
 		}
 	}
-	
+
 	td {
 		border-bottom: 1px solid darken($color-widget-bg, 10%);
 		padding: $grid-y - 1 2px;
@@ -1243,14 +1247,14 @@ body.cms {
 	background: #D4E2EC;
 	text-shadow: none;
 	border: 0;
-	
+
 	> strong,
 	> a {
 		font-size: 14px;
 	}
 }
 
-/** 
+/**
  * CMS Batch actions
  */
 .cms-content-batchactions-button {
@@ -1376,7 +1380,7 @@ form.member-profile-form {
 			text-indent: -9999em;
 			display: inline-block;
 			width: 20px;
-			background:url(../images/question.png) no-repeat 0px 0px; 
+			background:url(../images/question.png) no-repeat 0px 0px;
 		}
 	}
 
@@ -1387,14 +1391,14 @@ form.member-profile-form {
 	#CsvFile .middleColumn {
 		background: none !important;
 	}
-	
+
 	.advanced h4 {
 		margin-bottom: .5em;
 	}
 	.Actions {
 		text-align: left;
 		border: 0;
-	}	
+	}
 	input.customFormat {
 		width: $grid-x * 10;
 		border: 1px solid #ccc !important;
@@ -1439,7 +1443,7 @@ form.member-profile-form {
 			li {
 				float: none;
 				width: auto;
-			}	
+			}
 		}
 	}
 }
@@ -1461,13 +1465,13 @@ form.member-profile-form {
 		width: 800px;
 		z-index: 40;
 	}
-	
+
 	.cms-content-fields {
-		// always show a y scroll bar as popups like TreeDropdowns 
+		// always show a y scroll bar as popups like TreeDropdowns
 		// can trigger longer pages and the extra scroll bar doesn't fire our sizing bar
 		overflow-y: auto;
 		overflow-x: auto;
-		background: $tab-panel-texture-color;	
+		background: $tab-panel-texture-color;
 		width: 100%;
 		#Root_Main {
 			.confirmedpassword {
@@ -1488,19 +1492,19 @@ form.member-profile-form {
 			ul.optionset li {
 				float:none;
 			}
-		}			
+		}
 				}
 	form.member-profile-form {
 		#Root .ui-tabs-nav {
 			display: none;
 			}
-		
+
 		#Root_Main, #Root_Permissions {
 			border: none;
 			}
 		}
 	}
-		
+
 /** --------------------------------------------
  * "Settings" Form
  * -------------------------------------------- */
@@ -1533,7 +1537,7 @@ form.member-profile-form {
 			bottom: 0;
 			width:100%;
 		}
-		a { 
+		a {
 			display: block;
 			text-align: right;
 			padding: $grid-y/2 0;
@@ -1545,7 +1549,7 @@ form.member-profile-form {
 				color: #555d60;
 				font-size: 16px;
 			}
-			
+
 			&.toggle-expand {
 				width: 40px; // will set the collapsed width
 				display: none;
@@ -1565,7 +1569,7 @@ form.member-profile-form {
 	}
 	&.collapsed {
 		cursor: pointer;
-		.cms-panel-header *, 
+		.cms-panel-header *,
 		.cms-panel-content,
 		.cms-panel-toggle a.toggle-collapse{
 			display:none;
@@ -1665,12 +1669,12 @@ form.member-profile-form {
 }
 /** ------------------------------------------------------------------
 * Dialog
-* 
+*
 * Contained in a jQuery UI dialog ('.ui-dialog'), with either inline
 * markup (for the "insert" dialogs), or an iframe (for member profile).
 * ----------------------------------------------------------------- */
 
-// overlay for switching between CMS panes 
+// overlay for switching between CMS panes
 .cms .ui-widget-overlay-light {
 	background: #aaaaaa url(../../thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
 	opacity: 0.3;
@@ -1698,7 +1702,7 @@ form.member-profile-form {
 	overflow: visible;
 	padding: 0;
 	@include box-shadow(0px 0px 30px 10px rgba(0,0,0,.3));
- 
+
   	// Titlebar for pop-up dialog.
 	.ui-dialog-titlebar.ui-widget-header {
 	  	font-size: $font-base-size+2;
@@ -1707,7 +1711,7 @@ form.member-profile-form {
 		background: {
 			color:transparent;
 			image:url(../images/textures/cms_content_header.png);
-			repeat:repeat;	
+			repeat:repeat;
 		}
 		@include box-shadow($color-shadow-dark 0 0 ($grid-x / 2) inset);
 		.ui-dialog-title {
@@ -1760,7 +1764,7 @@ form.member-profile-form {
 		.clear {
 			clear: both;
 		}
-		
+
 	}
 
 	&.loading {
@@ -1801,9 +1805,9 @@ body.cms-dialog {
 				position: absolute;
 				left: 8px;
 				top: 13px;
-				font-weight: normal; 
+				font-weight: normal;
 				color: #888;
-				width: 35px; 
+				width: 35px;
 				padding-right: 0;
 			}
 
@@ -1883,11 +1887,11 @@ body.cms-dialog {
 		.field{
 			border-bottom: 1px solid $color-shadow-light;
     		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
-    		&.last{				
+    		&.last{
 				border-bottom:none;
 				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
 				margin-bottom:0;
-			}	
+			}
 		}
 	}
 
@@ -2006,7 +2010,7 @@ body.cms-dialog {
 	.title {
 		height: 26px - 2*4px; // minus padding
 		padding: 4px;
-	}	
+	}
 }
 
 
@@ -2068,7 +2072,7 @@ form.small {
 	.cms-file-info-data {
 		// Ensure it fits beside the image preview, increased size for long url
 		max-width: 550px;
-		
+
 
 		// Reduced label widths to fit everything in smaller space
 		.field {
@@ -2155,7 +2159,7 @@ form.import-form {
 .ss-uploadfield-item-edit-all .ui-button-text{
 	padding-right:0;
 }
-	
+
 .toggle-details-icon {
 	background: sprite($sprites32, menu-arrow-down) no-repeat;
 	.ss-uploadfield-item-edit-all &{
@@ -2163,22 +2167,22 @@ form.import-form {
 		display:inline-block;
 		width:8px;
 		height:8px;
-		padding-left:5px;		
+		padding-left:5px;
 	}
 
-	&.opened {					
+	&.opened {
-		background: sprite($sprites32, menu-arrow-up) no-repeat;	
+		background: sprite($sprites32, menu-arrow-up) no-repeat;
 		.ss-uploadfield-item-edit-all &{
-			background: sprite($sprites32, menu-arrow-deselected-up) no-repeat;			
+			background: sprite($sprites32, menu-arrow-deselected-up) no-repeat;
-		}		
+		}
 	}
 }
 
 /** --------------------------------------------
- * Hide preview toggle link by default. May be shown 
+ * Hide preview toggle link by default. May be shown
  in IE7 stylesheet and forced to show with js if needed
  * -------------------------------------------- */
-.cms .Actions > .cms-preview-toggle-link, 
+.cms .Actions > .cms-preview-toggle-link,
 .cms .cms-navigator > .cms-preview-toggle-link{
 	display:none;
 }

admin/scss/_uitheme.scss

@@ -91,7 +91,7 @@
 	overflow-y: auto;
 
 	/** sorry about the !important but the specificity of other selectors mandates it over writing out very specific selectors **/
-	& .loading {
+	&-loading {
 		background-image: url(../images/throbber.gif) !important;
 		background-position: 97% center !important;
 		background-repeat: no-repeat !important;

control/HTTPRequest.php

@@ -671,7 +671,7 @@ class SS_HTTPRequest implements ArrayAccess {
 		}
 
 		if ($headerOverrideIP) {
-			return $headerOverrideIP;
+			return $this->getIPFromHeaderValue($headerOverrideIP);
 		} elseif(isset($_SERVER['REMOTE_ADDR'])) {
 			return $_SERVER['REMOTE_ADDR'];
 		} else {
@@ -679,6 +679,28 @@ class SS_HTTPRequest implements ArrayAccess {
 		}
 	}
 
+	/**
+	 * Extract an IP address from a header value that has been obtained. Accepts single IP or comma separated string of
+	 * IPs
+	 *
+	 * @param string $headerValue The value from a trusted header
+	 * @return string The IP address
+	 */
+	protected function getIPFromHeaderValue($headerValue) {
+		if (strpos($headerValue, ',') !== false) {
+			//sometimes the IP from a load balancer could be "x.x.x.x, y.y.y.y, z.z.z.z" so we need to find the most
+			// likely candidate
+			$ips = explode(',', $headerValue);
+			foreach ($ips as $ip) {
+				$ip = trim($ip);
+				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+					return $ip;
+				}
+			}
+		}
+		return $headerValue;
+	}
+
 	/**
 	 * Returns all mimetypes from the HTTP "Accept" header
 	 * as an array.

control/injector/Injector.php

@@ -64,6 +64,7 @@ use SilverStripe\Framework\Injector\Factory;
  *
  * Specify a configuration array of the format
  *
+ * <code>
  * array(
  *		array(
  *			'id'			=> 'BeanId',					// the name to be used if diff from the filename
@@ -96,6 +97,7 @@ use SilverStripe\Framework\Injector\Factory;
  *		// or simply
  *		'OtherBean'		=> 'SomeClass',
  * )
+ * </code>
  *
  * In addition to specifying the bindings directly in the configuration,
  * you can simply create a publicly accessible property on the target

core/startup/ErrorControlChain.php

@@ -67,9 +67,21 @@ class ErrorControlChain {
 		$this->error = (bool)$error;
 	}
 
+	/**
+	 * Sets whether errors are suppressed or not
+	 * Notes:
+	 * - Errors cannot be suppressed if not handling errors.
+	 * - Errors cannot be un-suppressed if original mode dis-allowed visible errors
+	 *
+	 * @param bool $suppression
+	 */
 	public function setSuppression($suppression) {
 		$this->suppression = (bool)$suppression;
-		if ($this->handleFatalErrors) ini_set('display_errors', !$suppression);
+		// Don't modify errors unless handling fatal errors, and if errors were
+		// originally allowed to be displayed.
+		if ($this->handleFatalErrors && $this->originalDisplayErrors) {
+			ini_set('display_errors', !$suppression);
+		}
 	}
 
 	/**
@@ -167,7 +179,7 @@ class ErrorControlChain {
 		$this->handleFatalErrors = true;
 
 		$this->originalDisplayErrors = ini_get('display_errors');
-		ini_set('display_errors', !$this->suppression);
+		$this->setSuppression($this->suppression);
 
 		$this->step();
 	}

core/startup/ParameterConfirmationToken.php

@@ -194,8 +194,8 @@ class ParameterConfirmationToken {
 			$_SERVER['HTTP_HOST'],
 			// SilverStripe base
 			self::$alternateBaseURL !== null ? self::$alternateBaseURL : BASE_URL,
-			// And URL
+			// And URL including base script (eg: if it's index.php/page/url/)
-			$url
+			(defined('BASE_SCRIPT_URL') ? '/' . BASE_SCRIPT_URL : '') . $url,
 		));
 
 		// Join together with protocol into our current absolute URL, avoiding duplicated "/" characters

css/AssetUploadField.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
 "mappings": "AAAA,uMAIG;AAEH,+GAEsD;AAItD,+DAA+D;AAW/D,iEAAiE;AA2CjE,uCAAuC;AAKvC,+GAEqD;AAIrD,mHAEsD;AAItD,uSAMsD;AAItD,uJAEsD;AC6CtD;;EAEE;ACrIF,uCAAwC,GACvC,WAAW,EAAC,GAAG,EACf,KAAK,EAAC,IAAI,EACV,SAAS,EAAC,KAAK,EACf,OAAO,EAAC,KAAK;AAEb,+CAAQ,GACP,UAAU,EAAE,MAAM,EAClB,SAAS,EFgEM,IAAI;;AE5DrB,SAAU,GACT,YAAY,EAAE,IAAI;;AAGnB,qFAAoC,GACnC,QAAQ,EAAE,IAAI,EACd,UAAU,EAAE,OAAO;AAEnB,iHAAc,GACb,UAAU,EAAC,MAAM,EACjB,KAAK,EAAC,OAAyB,EAC/B,WAAW,EAAE,gBAAgB;AAI7B,uIAAK,GACJ,WAAW,EAAC,CAAC;;AAKhB,gDAAiD,GAEhD,OAAO,EAAE,IAAS;;AAGnB,oBAAqB,GACpB,aAAa,EAAE,CAAC,EC4Sf,eAAwC,ECnT/B,IAAkD,EDmT3D,kBAAwC,ECnT/B,IAAkD,EDmT3D,UAAwC,ECnT/B,IAAkD;AFU5D,uBAAG,GACF,aAAa,EAAE,kCAA6B,ECwS5C,eAAwC,ECnT/B,gCAAkD,EDmT3D,kBAAwC,ECnT/B,gCAAkD,EDmT3D,UAAwC,ECnT/B,gCAAkD,EFa3D,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,IAAI,EACX,QAAQ,EAAC,QAAQ;AAElB,2BAAO,GACN,aAAa,EAAE,CAAC,EAChB,UAAU,EAAC,IAAI;AAEhB,kCAAa,GACZ,KAAK,EAAC,IAAI,EACV,UAAU,EAAC,IAAI,EACf,QAAQ,EAAC,QAAQ;AD/BlB,sDAAO,GACN,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,EACX,UAAU,EAAE,MAAM;AAEnB,8DAAe,GAAE,IAAI,EAAC,CAAC;AC4BrB,uDAAM,GACL,KAAK,EAAC,IAAI,EACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAC,IAAI,EAChB,WAAW,EAAC,KAAK;AAElB,yDAAQ,GACP,OAAO,EAAC,GAAG,EACX,KAAK,EAAC,KAAK;AAId,0DAAqC,GACpC,KAAK,EAAC,IAAI,EACV,QAAQ,EAAC,QAAQ,EACjB,OAAO,EAAC,CAAC;AACT,wFAA8B,GAC7B,OAAO,EAAC,CAAC,EACT,QAAQ,EAAC,QAAQ,EACjB,GAAG,EAAC,KAAK,EACT,OAAO,EAAC,CAAC,EACT,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAC,CAAC,EC+PR,eAAwC,ECnT/B,IAAkD,EDmT3D,kBAAwC,ECnT/B,IAAkD,EDmT3D,UAAwC,ECnT/B,IAAkD,EFsD1D,KAAK,EFxDK,OAAO;AEyDjB,8FAAO,GACN,KAAK,EAAE,OAAO;AAMjB,0CAAsB,GACrB,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,EACV,KAAK,EAAC,IAAI;AAEV,+DAAqB,GACpB,MAAM,EAAE,iBAA+C,EC+OxD,kBAAwC,ED9OhB,GAAG,EC8O3B,qBAAwC,EE9Sb,GAAuB,EF8SlD,aAAwC,ED9OhB,GAAG,EC8O3B,oBAAwC,EGzUvB,OAA8C,EHyU/D,kBAAwC,EG1U3B,WAAuC,EH0UpD,uBAAwC,EGzUvB,OAA8C,EHyU/D,eAAwC,EG1U3B,WAAuC,EJ8FnD,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ;AAClB,qEAAM,GACL,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,OAAO,EACzB,MAAM,EAAE,iBAAiB;AAG3B,uEAA6B,GAC5B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC;AAEV,2FAAoB,GAChB,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,WAAW;AAGxB,oEAA0B,GACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,IAAI,EACjB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,OAAO,EKrEtB,gBAAY,EAAE,6uBAAgC,EA2B9C,eAAe,EAAE,IAAI,EA3BrB,gBAAY,EAAE,qMAAgC,EAA9C,gBAAY,EAAE,sGAAgC,EAA9C,gBAAY,EAAE,yGAAgC,EAE9C,gBAAY,EAAE,uGAAO;ALsEzB,oFAA0C,GACzC,gBAAgB,EAAE,OAAO,EACzB,aAAa,EAAC,KAAK,EK1EhB,gBAAY,EAAE,6wCAAgC,EA2B9C,eAAe,EAAE,IAAI,EA3BrB,gBAAY,EAAE,wcAAgC,EAA9C,gBAAY,EAAE,uOAAgC,EAA9C,gBAAY,EAAE,0OAAgC,EAE9C,gBAAY,EAAE,wOAAO;AL2ExB,8GAA0B,GACzB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,OAAO,EACd,UAAU,EAAE,OAAkC,EAC9C,UAAU,EAAE,wBAA6C;AAEzD,oHAAM,GACL,WAAW,EAAE,oCAA2B;AAI3C,sFAA4C,GAC3C,gBAAgB,EFlGH,OAAO,EOSjB,gBAAY,EAAE,6uBAAgC,EA2B9C,eAAe,EAAE,IAAI,EA3BrB,gBAAY,EAAE,qMAAgC,EAA9C,gBAAY,EAAE,sGAAgC,EAA9C,gBAAY,EAAE,yGAAgC,EAE9C,gBAAY,EAAE,uGAAO;ALoGzB,oEAA0B,GACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,GAAG,EACV,KAAK,EAAC,OAAyB,EAC/B,UAAU,EFxHW,OAAO,EEyH5B,UAAU,EAAE,wBAAe,ECuK5B,kBAAwC,EDtKhB,GAAG,ECsK3B,qBAAwC,EE9Sb,GAAuB,EF8SlD,aAAwC,EDtKhB,GAAG,EAC1B,WAAW,EAAE,IAAI,EACjB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,IAAI,EAChB,MAAM,EAAC,OAAO,EAEd,OAAO,EAAC,KAAK,EACb,YAAY,EAAC,KAAK;AAElB,0EAAM,GACL,WAAW,EAAE,oCAA2B,EACxC,OAAO,EAAC,MAAM,EACd,KAAK,EAAC,IAAI,EACV,SAAS,EAAC,GAAG,EACb,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,SAAS,EDvLrB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAInB,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,QAAQ;ACoLxB,gGAA4B,GAC3B,QAAQ,EAAC,QAAQ,EACjB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,SAAS,EAClB,SAAS,EAAC,GAAG,ED9LhB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAInB,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,QAAQ,EC0LvB,WAAW,EAAE,oCAA2B;AAExC,oHAAsB,GACrB,WAAW,EAAE,oCAA2B,EACxC,KAAK,EAAE,OAAsC;AAE9C,sHAAwB,GACvB,KAAK,EAAE,OAA2B;AAEnC,sHAAwB,GACvB,KAAK,EFlKkB,OAAO;AEsKjC,uEAA6B,GAC5B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,IAAI,EAEX,SAAS,EAAC,IAAI;AMlNhB,qFAAc,GACb,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,CAAC,ELuUT,eAAwC,ECnT/B,IAAkD,EDmT3D,kBAAwC,ECnT/B,IAAkD,EDmT3D,UAAwC,ECnT/B,IAAkD,EKK3D,WAAW,EANG,IAAwB,EDhBtC,KAAK,ERgBY,KAAK,EQftB,KAAK,EAAE,KAAK;AAEZ,gHAA6B,GAE5B,OAAO,EAAE,IAAI;AAEd,6OAAsE,GL6TtE,kBAAwC,EK5ThB,CAAC,EL4TzB,qBAAwC,EE9Sb,CAAuB,EF8SlD,aAAwC,EK5ThB,CAAC,EACxB,WAAW,EAAC,kCAAyB,EACrC,UAAU,EAAC,GAAG,EACd,MAAM,EAAE,OAAO,EACf,OAAO,EAAC,GAAG;AACX,yPAAO,GACN,OAAO,EAAC,CAAC;AAEV,+PAAS,GACP,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,CAAC,EACT,QAAQ,EAAC,QAAQ,EACjB,GAAG,EAAC,GAAG;AAaX,8GAA2B,GAC1B,OAAO,EAAC,GAAG,EACX,WAAW,EAAE,GAAG,EAChB,cAAc,EAAE,CAAC,EACjB,MAAM,EAAC,IAAI,EL+RX,kBAAwC,EK9RjB,CAAC,EL8RxB,qBAAwC,EE9Sb,CAAuB,EF8SlD,aAAwC,EK9RjB,CAAC;AACxB,6HAAgB,GACf,UAAU,EAAC,IAAI,EACf,OAAO,EAAC,CAAC;AACT,iJAAmB,GAClB,OAAO,EAAC,CAAC;AAGX,kIAAmB,GAClB,OAAO,EAAC,GAAG,EACX,WAAW,EAAC,GAAG,EACf,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,OAAO;AACf,uJAAqB,GACpB,UAAU,EAAC,GAAG,EACd,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,GAAG,EACX,cAAc,EAAE,MAAM;AACtB,8JAAS,GACR,UAAU,EAAC,CAAC;AAMhB,8FAAS,GACR,OAAO,EAAE,IAAI;AN6Ib,wEAA8B,GAC7B,KAAK,EAAE,IAAI;AAEX,4EAAI,GCiHL,kBAAwC,EDhHf,GAAG,ECgH5B,qBAAwC,EE9Sb,GAAuB,EF8SlD,aAAwC,EDhHf,GAAG,EAC1B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,IAAI;AAEZ,yGAAiC,GAChC,gBAAgB,EAAE,OAAO,EK5KvB,gBAAY,EAAE,6uBAAgC,EA2B9C,eAAe,EAAE,IAAI,EA3BrB,gBAAY,EAAE,sMAAgC,EAA9C,gBAAY,EAAE,uGAAgC,EAA9C,gBAAY,EAAE,0GAAgC,EAE9C,gBAAY,EAAE,wGAAO;AL6KxB,8GAAsC,GACrC,KAAK,EAAE,CAAC,EACR,UAAU,EAAE,8DAA8D;AAI5E,wEAA8B,GAC7B,oFAAoF,CACpF,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,IAAI;AAEX,gFAAU,GACT,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,kDAAkD;AAE9D,uFAAO,GACN,yFAAyF,CACzF,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAChC,MAAM,EAAE,IAAI;AAId,+EAAO,GACN,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,IAAS,EAClB,UAAU,EAAE,OAAO;AAOrB,sEAA0B,GACzB,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,QAAQ;AAChB,uFAAkB,GACjB,MAAM,EAAE,eAAe;AAExB,4EAAK,GACJ,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,IAAI,EACjB,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAC,GAAG;AAGlB,yEAA6B,GAC5B,wBAAwB,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,KAAK;AACd,sGAA6B,GAC5B,UAAU,EAAE,uDAAuD,EACnE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,UAAU,EAAC,KAAK;AAGlB,0EAA8B,GAC7B,KAAK,EAAE,IAAI,EACX,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,IAAI,EACf,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,IAAI,EACjB,UAAU,EAAC,IAAI,EACf,OAAO,EAAE,IAAI;AACb,2FAAkB,GACjB,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,IAAI;AAGlB,qEAAyB,GACxB,UAAU,EAAC,GAAG,EACd,OAAO,EAAE,KAAK,EC2Bf,kBAAwC,ED1BhB,IAAI,EC0B5B,qBAAwC,EE9Sb,IAAuB,EF8SlD,aAAwC,ED1BhB,IAAI,EC0B5B,eAAwC,ECnT/B,yDAAkD,EDmT3D,kBAAwC,ECnT/B,yDAAkD,EDmT3D,UAAwC,ECnT/B,yDAAkD,EF2R1D,MAAM,EAAE,kBAAkC,EAC1C,UAAU,EAAE,OAAwB,EACpC,OAAO,EAAE,IAAI,EACb,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,KAAK,EAChB,KAAK,EAAE,IAAI,EACX,UAAU,EAAE,MAAM;AAGjB,kFAAO,GCeT,eAAwC,ECnT/B,0CAAkD,EDmT3D,kBAAwC,ECnT/B,0CAAkD,EDmT3D,UAAwC,ECnT/B,0CAAkD;AFwS1D,yEAAI,GACH,KAAK,EAAC,OAAyB,EAC/B,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,4CAA4C,EACxD,OAAO,EAAC,CAAC,EACT,OAAO,EAAE,UAAU,EACnB,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,IAAI,EACjB,OAAO,EAAE,YAAY;AACrB,8EAAK,GACJ,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,IAAI,EACf,OAAO,EAAC,EAAE,EACV,UAAU,EAAC,IAAI;AAGjB,sFAAkB,GACjB,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,KAAK,EAChB,QAAQ,EAAC,MAAM,EACf,OAAO,EAAC,CAAC,EACT,UAAU,EAAC,GAAG;AACd,0FAAG,GACF,mBAAmB,EAAC,MAAM,EAC1B,WAAW,EAAC,IAAI,EAChB,WAAW,EAAE,IAAI;AACjB,+FAAI,GACH,MAAM,EAAC,IAAI,EACX,SAAS,EAAC,IAAI,EACd,WAAW,EAAE,IAAI;;AAQvB,kIAE0D;AAE1D,gSAMyD,GAExD,qBAAqB;EAIlB,gFAAU,GACT,gBAAgB,EAAE,mCAAmC,EACrD,eAAe,EAAE,SAAS",
-"sources": ["../admin/scss/themes/_default.scss","../admin/scss/_mixins.scss","../scss/AssetUploadField.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/_support.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_box-shadow.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_border-radius.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_background-clip.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_text-shadow.scss"],
+"sources": ["../admin/scss/themes/_default.scss","../admin/scss/_mixins.scss","../scss/AssetUploadField.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_background-clip.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss"],
 "names": [],
 "file": "AssetUploadField.css"
 }

css/ConfirmedPasswordField.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,wCAAyC,yGAExC,OAAO,EAAC,IAAI",
+"mappings": "AAAA,wCAAyC,GACxC,qGAAqG,CACrG,OAAO,EAAC,IAAI",
 "sources": ["../scss/ConfirmedPasswordField.scss"],
 "names": [],
 "file": "ConfirmedPasswordField.css"

css/Form.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,IAAK;AAEJ,MAAE,GACD,SAAS,EAAE,IAAI;AAGhB,aAAS,GACR,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,EACV,YAAY,EAAE,IAAI;AAGnB,WAAO,GACN,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,UAAU,EAClB,cAAc,EAAE,MAAM;AAGvB,eAAW,GACV,MAAM,EAAE,WAAW;AAGpB,mBAAe,GACd,WAAW,EAAE,CAAC;AAGf,eAAW,GACV,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,IAAI,EACX,WAAW,EAAE,KAAK;AAGnB,oBAAgB,GACf,KAAK,EAAE,IAAI;AAGZ,aAAQ,GACP,KAAK,EAAG,KAAK;AAGd,6CAA+B,GAC9B,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,GAAG;AAGX,yBAAqB,GACpB,MAAM,EAAE,eAAe,EACvB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,GAAG,EACZ,MAAM,EAAC,KAAK;AAGb,sBAAkB,GACjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,GAAG,EAChB,cAAc,EAAE,MAAM;AAGvB,qBAAiB,GAChB,OAAO,EAAE,MAAM;AAIhB,uBAAmB,GAClB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,SAAS;AAM3B,aAAS,GACR,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,IAAI,EACjB,MAAM,EAAE,eAAe,EACvB,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAErB,oBAAS,GACR,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,qBAAU,GACT,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,iBAAM,GACL,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,gDAAyB,GACxB,OAAO,EAAC,KAAK,EACb,UAAU,EAAC,GAAG,EACd,KAAK,EAAC,OAAO,EACb,KAAK,EAAC,KAAK,EACX,YAAY,EAAE,OAAO;AAGtB,wBAAa,GACZ,KAAK,EAAC,OAAO,EACb,KAAK,EAAC,KAAK,EACX,YAAY,EAAE,OAAO;;AAKxB,yBAA0B,GACzB,MAAM,EAAE,CAAC",
+"mappings": "AAAA,IAAK,GA4EJ,eAEG;AA5EH,MAAE,GACD,SAAS,EAAE,IAAI;AAGhB,aAAS,GACR,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,EACV,YAAY,EAAE,IAAI;AAGnB,WAAO,GACN,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,UAAU,EAClB,cAAc,EAAE,MAAM;AAGvB,eAAW,GACV,MAAM,EAAE,WAAW;AAGpB,mBAAe,GACd,WAAW,EAAE,CAAC;AAGf,eAAW,GACV,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,IAAI,EACX,WAAW,EAAE,KAAK;AAGnB,oBAAgB,GACf,KAAK,EAAE,IAAI;AAGZ,aAAQ,GACP,KAAK,EAAG,KAAK;AAGd,6CAA+B,GAC9B,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,GAAG;AAGX,yBAAqB,GACpB,MAAM,EAAE,eAAe,EACvB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,GAAG,EACZ,MAAM,EAAC,KAAK;AAGb,sBAAkB,GACjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,GAAG,EAChB,cAAc,EAAE,MAAM;AAGvB,qBAAiB,GAChB,OAAO,EAAE,MAAM;AAIhB,uBAAmB,GAClB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,SAAS;AAM3B,aAAS,GACR,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,IAAI,EACjB,MAAM,EAAE,eAAe,EACvB,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAErB,oBAAS,GACR,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,qBAAU,GACT,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,iBAAM,GACL,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO;AAGtB,gDAAyB,GACxB,OAAO,EAAC,KAAK,EACb,UAAU,EAAC,GAAG,EACd,KAAK,EAAC,OAAO,EACb,KAAK,EAAC,KAAK,EACX,YAAY,EAAE,OAAO;AAGtB,wBAAa,GACZ,KAAK,EAAC,OAAO,EACb,KAAK,EAAC,KAAK,EACX,YAAY,EAAE,OAAO;;AAKxB,yBAA0B,GACzB,MAAM,EAAE,CAAC",
 "sources": ["../scss/Form.scss"],
 "names": [],
 "file": "Form.css"

css/GridField.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
-"sources": ["../scss/GridField.scss","../admin/scss/themes/_default.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_inline-block.scss","../admin/scss/_mixins.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss"],
+"sources": ["../scss/GridField.scss","../admin/scss/themes/_default.scss","../admin/scss/_mixins.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_inline-block.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss"],
 "names": [],
 "file": "GridField.css"
 }

css/TreeDropdownField.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
-"sources": ["../scss/TreeDropdownField.scss","../admin/scss/_mixins.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-sizing.scss"],
+"sources": ["../admin/scss/_mixins.scss","../scss/TreeDropdownField.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-sizing.scss"],
 "names": [],
 "file": "TreeDropdownField.css"
 }

css/UploadField.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
 "mappings": "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",
-"sources": ["../admin/scss/themes/_default.scss","../admin/scss/_mixins.scss","../scss/UploadField.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/_support.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_border-radius.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_images.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_box-shadow.scss"],
+"sources": ["../admin/scss/themes/_default.scss","../admin/scss/_mixins.scss","../scss/UploadField.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss"],
 "names": [],
 "file": "UploadField.css"
 }

css/debug.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
 "mappings": "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",
-"sources": ["../scss/debug.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss"],
+"sources": ["../scss/debug.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../var/lib/gems/2.1.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss"],
 "names": [],
 "file": "debug.css"
 }

dev/Backtrace.php

@@ -16,6 +16,7 @@ class SS_Backtrace {
 		'mysql_connect',
 		'mssql_connect',
 		'pg_connect',
+		array('PDO', '__construct'),
 		array('mysqli', 'mysqli'),
 		array('mysqli', 'select_db'),
 		array('DB', 'connect'),

dev/CSVParser.php

@@ -10,10 +10,10 @@
  *
  * <code>
  * $parser = new CSVParser('myfile.csv');
- * $parser->mapColumns(
+ * $parser->mapColumns(array(
  *    'first name' => 'FirstName'
  *    'lastname' => 'Surname',
- *    'last name' => 'Surname'
+ *    'last name' => 'Surname',
  * ));
  * foreach($parser as $row) {
  * 	 // $row is a map of column name => column value

dev/Debug.php

@@ -340,6 +340,7 @@ class Debug {
 		if(Director::is_ajax()) {
 			echo $friendlyErrorMessage;
 		} else {
+			if(!headers_sent()) header('Content-Type: text/html');
 			if(class_exists('ErrorPage')){
 				$errorFilePath = ErrorPage::get_filepath_for_errorcode(
 					$statusCode,
@@ -347,7 +348,6 @@ class Debug {
 				);
 				if(file_exists($errorFilePath)) {
 					$content = file_get_contents($errorFilePath);
-					if(!headers_sent()) header('Content-Type: text/html');
 					// $BaseURL is left dynamic in error-###.html, so that multi-domain sites don't get broken
 					echo str_replace('$BaseURL', Director::absoluteBaseURL(), $content);
 				}

dev/SapphireTest.php

@@ -222,12 +222,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
 
 		$prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_';
 
-		// Set up email
-		$this->originalMailer = Email::mailer();
-		$this->mailer = new TestMailer();
-		Injector::inst()->registerService($this->mailer, 'Mailer');
-		Config::inst()->remove('Email', 'send_all_emails_to');
-
 		// Todo: this could be a special test model
 		$this->model = DataModel::inst();
 
@@ -288,6 +282,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
 
 		// Clear requirements
 		Requirements::clear();
+
+		// Set up email
+		$this->originalMailer = Email::mailer();
+		$this->mailer = new TestMailer();
+		Injector::inst()->registerService($this->mailer, 'Mailer');
+		Config::inst()->remove('Email', 'send_all_emails_to');
 	}
 
 	/**

docs/en/00_Getting_Started/00_Server_Requirements.md

@@ -8,7 +8,7 @@ Our web-based [PHP installer](installation/) can check if you meet the requireme
 
 ## Web server software requirements
 
- * PHP 5.3.3+
+ * PHP 5.3.3+, <7
  * We recommend using a PHP accelerator or opcode cache, such as [xcache](http://xcache.lighttpd.net/) or [WinCache](http://www.iis.net/download/wincacheforphp).
  * Allocate at least 48MB of memory to each PHP process. (SilverStripe can be resource hungry for some intensive operations.)
  * Required modules: dom, gd2, fileinfo, hash, iconv, mbstring, mysqli (or other database driver), session, simplexml, tokenizer, xml.
@@ -23,7 +23,7 @@ Our web-based [PHP installer](installation/) can check if you meet the requireme
   * MySQL 5.0+
   * PostgreSQL 8.3+ (requires ["postgresql" module](http://silverstripe.org/postgresql-module))
   * SQL Server 2008+ (requires ["mssql" module](http://silverstripe.org/microsoft-sql-server-database/))
-  * Support for `[Oracle](http://www.silverstripe.org/oracle-database-module/)` and [SQLite](http://silverstripe.org/sqlite-database/) is not commercially supported, but is under development by our open source community.
+  * Support for [Oracle](http://www.silverstripe.org/oracle-database-module/) and [SQLite](http://silverstripe.org/sqlite-database/) is not commercially supported, but is under development by our open source community.
  * One of the following web server products: 
   * Apache 2.0+ with mod_rewrite and "AllowOverride All" set
   * IIS 7+
@@ -34,6 +34,11 @@ Our web-based [PHP installer](installation/) can check if you meet the requireme
   * Microsoft Windows XP SP3, Vista, Windows 7, Server 2008, Server 2008 R2
   * Mac OS X 10.4+
 
+### Why doesn't SilverStripe 3 work with PHP 7?
+Unfortunately, SilverStripe has classes named the same as PHP reserved words, such as "Int" and "Float". This means that 
+we are unable to make SilverStripe 3 support PHP 7 without breaking backward compatibility. SilverStripe 4 will work 
+with PHP 7 and will be released in 2016. Until then, we recommend that you use PHP 5.6.
+
 ## Web server hardware requirements
 
 Hardware requirements vary widely depending on the traffic to your website, the complexity of its logic (i.e., PHP), and

docs/en/01_Tutorials/01_Building_A_Basic_Site.md

@@ -367,7 +367,7 @@ It always tries to use the most specific template in an inheritance chain.
 
 ### Creating a new template
 
-To create a new template layout, create a copy of *Page.ss* (found in *themes/simple/templates/Layout*) and call it *HomePage.ss*. If we flush the cache (*?flush=1*), SilverStripe should now be using *HomePage.ss* for the homepage, and *Page.ss* for the rest of the site. Now let's customize the *HomePage* template. 
+To create a new template layout, create a copy of *Page.ss* (found in *themes/simple/templates/Layout*) and call it *HomePage.ss*. If we flush the cache (*?flush=1*), SilverStripe should now be using *HomePage.ss* for the homepage, and *Page.ss* for the rest of the site. Now let's customise the *HomePage* template. 
 
 First, we don't need the breadcrumbs and the secondary menu for the homepage. Let's remove them:
 	:::ss
@@ -401,7 +401,7 @@ then descend into the *themes/simple/templates/Layout* folder, and will use *Pag
 
 ## Summary
 
-So far we have taken a look at the different areas and functionality within the pages area of the CMS. We have learnt about template variables, controls and if statements and used these to build a basic, but fully functional, website. We have also briefly covered page types, and looked at how they correspond to templates and sub-templates. Using this knowledge, we have customized our website's homepage design.
+So far we have taken a look at the different areas and functionality within the pages area of the CMS. We have learnt about template variables, controls and if statements and used these to build a basic, but fully functional, website. We have also briefly covered page types, and looked at how they correspond to templates and sub-templates. Using this knowledge, we have customised our website's homepage design.
 
 In the next tutorial, [Extending a Basic Site](/tutorials/extending_a_basic_site), we will explore page types on a deeper level, and look at customising our own page types to extend the functionality of SilverStripe.
 

docs/en/02_Developer_Guides/00_Model/05_Extending_DataObjects.md

@@ -12,7 +12,7 @@ data records.
 
 ## onBeforeWrite
 
-You can customize saving-behavior for each DataObject, e.g. for adding workflow or data customization. The function is 
+You can customise saving-behavior for each DataObject, e.g. for adding workflow or data customization. The function is 
 triggered when calling *write()* to save the object to the database. This includes saving a page in the CMS or altering 
 a `ModelAdmin` record.
 

docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md

@@ -380,7 +380,7 @@ By default, it uses the template defined in `cms/templates/BreadcrumbsTemplate.s
 	<% end_if %>
 
 <div class="info" markdown="1">
-To customize the markup that the `$Breadcrumbs` generates, copy `cms/templates/BreadcrumbsTemplate.ss` to 
+To customise the markup that the `$Breadcrumbs` generates, copy `cms/templates/BreadcrumbsTemplate.ss` to 
 `mysite/templates/BreadcrumbsTemplate.ss`, modify the newly copied template and flush your SilverStripe cache.
 </div>
 

docs/en/02_Developer_Guides/01_Templates/05_Template_Inheritance.md

@@ -5,7 +5,7 @@ summary: Override and extend module and core markup templates from your applicat
 
 Bundled within SilverStripe are default templates for any markup the framework outputs for things like Form templates,
 Emails or RSS Feeds. These templates are provided to make getting your site up and running quick with sensible defaults 
-but it's easy to replace and customize SilverStripe (and add-on's) by providing custom templates in your own 
+but it's easy to replace and customise SilverStripe (and add-on's) by providing custom templates in your own 
 `mysite/templates` folder or in your `themes/your_theme/templates` folder.
 
 Take for instance the `GenericEmail` template in SilverStripe. This is the HTML default template that any email created 

docs/en/02_Developer_Guides/01_Templates/06_Themes.md

@@ -75,7 +75,7 @@ themes
 
 If you want to submit your theme to the SilverStripe directory then check
 
-* You should ensure your templates are well structured, modular and commented so it's easy for other people to customize 
+* You should ensure your templates are well structured, modular and commented so it's easy for other people to customise 
 *  Templates should not contain text inside images and all images provided must be open source and not break any 
 copyright or license laws. This includes any icons your template uses.
 *  A theme does not include any PHP files. Only CSS, HTML, Images and javascript.

docs/en/02_Developer_Guides/01_Templates/index.md

@@ -1,6 +1,6 @@
 title: Templates and Views
 summary: This guide showcases the SilverStripe template engine and learn how to build your own themes.
-introduction: SilverStripe comes with it's own templating engine. This guide walks you through the features of the template engine, how to create custom templates and ways to customize your data output.
+introduction: SilverStripe comes with it's own templating engine. This guide walks you through the features of the template engine, how to create custom templates and ways to customise your data output.
 
 Most of what will be public on your website comes from template files that are defined in SilverStripe. Either in the
 core framework, the modules or themes you install, and your own custom templates. 
@@ -14,4 +14,4 @@ templates from your controllers.
 
 ## How to's
 
-[CHILDREN Folder=How_Tos]
+[CHILDREN Folder=How_Tos]

docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md

@@ -109,7 +109,7 @@ Action methods can return one of four main things:
 	 * We can render HTML and leave SilverStripe to set the response code and body.
 	 */
 	public function htmlaction() {
-		return $this->customize(new ArrayData(array(
+		return $this->customise(new ArrayData(array(
 			'Title' => 'HTML Action'
 		)))->renderWith('MyCustomTemplate');
 	}

docs/en/02_Developer_Guides/02_Controllers/03_Access_Control.md

@@ -30,7 +30,7 @@ directly calling methods that they shouldn't.
 			'cmsrestrictedaction' => 'CMS_ACCESS_CMSMain',
 			
 			// complexaction can only be accessed if $this->canComplexAction() returns true.
-			'complexaction' '->canComplexAction' 
+			'complexaction' => '->canComplexAction',
 
 			// complexactioncheck can only be accessed if $this->canComplexAction("MyRestrictedAction", false, 42) is true.
 			'complexactioncheck' => '->canComplexAction("MyRestrictedAction", false, 42)',
@@ -200,4 +200,4 @@ execution. This behavior can be used to implement permission checks.
 
 ## API Documentation
 
-* [api:Controller]
+* [api:Controller]

docs/en/02_Developer_Guides/03_Forms/00_Introduction.md

@@ -126,13 +126,17 @@ A field can be appended to the [api:FieldList].
 	$fields = $form->Fields();
 
 	// add a field
-	$fields->push(new TextField(..));
+	$fields->push(TextField::create(..));
 
 	// insert a field before another one
-	$fields->insertBefore(new TextField(..), 'Email');
+	$fields->insertBefore(TextField::create(..), 'Email');
 
 	// insert a field after another one
-	$fields->insertAfter(new TextField(..), 'Name');
+	$fields->insertAfter(TextField::create(..), 'Name');
+	
+	// insert a tab before the main content tab (used to position tabs in the CMS)
+	$fields->insertBefore(Tab::create(...), 'Main');
+	// Note: you need to create and position the new tab prior to adding fields via addFieldToTab()
 
 Fields can be fetched after they have been added in.
 	
@@ -153,7 +157,7 @@ information on the CMS interface.
 
 ## Modifying FormFields
 
-Each [api:FormField] subclass has a number of methods you can call on it to customize its' behavior or HTML markup. The
+Each [api:FormField] subclass has a number of methods you can call on it to customise its' behavior or HTML markup. The
 default `FormField` object has several methods for doing common operations. 
 
 <div class="notice" markdown="1">

docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md

@@ -232,7 +232,7 @@ database.
 ## GridFieldDetailForm
 
 The `GridFieldDetailForm` component drives the record viewing and editing form. It takes its' fields from 
-`DataObject->getCMSFields()` method but can be customized to accept different fields via the 
+`DataObject->getCMSFields()` method but can be customised to accept different fields via the 
 [api:GridFieldDetailForm::setFields()] method.
 
 	:::php

docs/en/02_Developer_Guides/05_Extending/01_Extensions.md

@@ -113,7 +113,7 @@ we added a `SayHi` method which is unique to our extension.
 ## Modifying Existing Methods
 
 If the `Extension` needs to modify an existing method it's a little trickier. It requires that the method you want to
-customize has provided an *Extension Hook* in the place where you want to modify the data. An *Extension Hook* is done 
+customise has provided an *Extension Hook* in the place where you want to modify the data. An *Extension Hook* is done 
 through the [api:Object::extend()] method.
 
 **framework/security/Member.php**

docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md

@@ -96,7 +96,7 @@ environments. If for some reason you don't have access to the command line, you
 
 ### Via the CLI
 
-The [sake](../cli) executable that comes with SilverStripe can trigger a customized [api:TestRunner] class that 
+The [sake](../cli) executable that comes with SilverStripe can trigger a customised [api:TestRunner] class that 
 handles the PHPUnit configuration and output formatting. While the custom test runner a handy tool, it's also more 
 limited than using `phpunit` directly, particularly around formatting test output.
 
@@ -176,7 +176,7 @@ databases on your machine. To get rid of them is a call to `http://yoursite.com/
 ## Custom PHPUnit Configuration
 
 The `phpunit` executable can be configured by command line arguments or through an XML file. SilverStripe comes with a 
-default `phpunit.xml.dist` that you can use as a starting point. Copy the file into `phpunit.xml` and customize to your 
+default `phpunit.xml.dist` that you can use as a starting point. Copy the file into `phpunit.xml` and customise to your 
 needs.
 
 **phpunit.xml**

docs/en/02_Developer_Guides/06_Testing/04_Fixtures.md

@@ -231,7 +231,7 @@ After we've created this object in the factory, `getId` is used to retrieve it b
 
 ### Default Properties
 
-Blueprints can be overwritten in order to customize their behavior. For example, if a Fixture does not provide a Team
+Blueprints can be overwritten in order to customise their behavior. For example, if a Fixture does not provide a Team
 name, we can set the default to be `Unknown Team`.
 
 	:::php

docs/en/02_Developer_Guides/06_Testing/index.md

@@ -41,7 +41,7 @@ of course this information can be version controlled and shared with other team
 **Note: This doesn't apply for running tests through the "sake" wrapper**
 
 SilverStripe comes with a default `phpunit.xml.dist` that you can use as a starting point. Copy the file into a new
-`phpunit.xml` and customize to your needs - PHPUnit will auto-detect its existence, and prioritize it over the default
+`phpunit.xml` and customise to your needs - PHPUnit will auto-detect its existence, and prioritize it over the default
 file.
 
 There's nothing stopping you from creating multiple XML files (see the `--configuration` flag in
@@ -99,7 +99,7 @@ All command-line arguments are documented on
 
 ### Via the "sake" Wrapper on Command Line
 
-The [sake](/developer_guides/cli/) executable that comes with SilverStripe can trigger a customized
+The [sake](/developer_guides/cli/) executable that comes with SilverStripe can trigger a customised
 [api:TestRunner] class that handles the PHPUnit configuration and output formatting.
 While the custom test runner a handy tool, its also more limited than using `phpunit` directly,
 particularly around formatting test output.

docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md

@@ -156,7 +156,7 @@ passing data through, escaping should happen at the end of the chain.
 	  }
 	}
 
-This might not be applicable in all cases - especially if you are building an API thats likely to be customized. If
+This might not be applicable in all cases - especially if you are building an API thats likely to be customised. If
 you're passing unescaped data, make sure to be explicit about it by writing *phpdoc*-documentation and *prefixing* your
 variables ($RAW_data instead of $data).
 

docs/en/02_Developer_Guides/10_Email/index.md

@@ -3,7 +3,7 @@ summary: Send HTML and plain text email from your SilverStripe application.
 # Email
 
 Creating and sending email in SilverStripe is done through the [api:Email] and [api:Mailer] classes. This document 
-covers how to create an `Email` instance, customize it with a HTML template, then send it through a custom `Mailer`.
+covers how to create an `Email` instance, customise it with a HTML template, then send it through a custom `Mailer`.
 
 ## Configuration
 
@@ -32,7 +32,7 @@ to `*text*`).
 
 <div class="info" markdown="1">
 The default HTML template for emails is named `GenericEmail` and is located in `framework/templates/email/`. To 
-customize this template, copy it to the `mysite/templates/Email/` folder or use `setTemplate` when you create the 
+customise this template, copy it to the `mysite/templates/Email/` folder or use `setTemplate` when you create the 
 `Email` instance.
 </div>
 

docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md

@@ -5,7 +5,7 @@
 CSV import can be easily achieved through PHP's built-in `fgetcsv()` method,
 but this method doesn't know anything about your datamodel. In SilverStripe,
 this can be handled through the a specialized CSV importer class that can
-be customized to fit your data.
+be customised to fit your data.
 
 ## The CsvBulkLoader class
 
@@ -63,7 +63,7 @@ below the search form on the left.
 
 ## Import through a custom controller
 
-You can have more customized logic and interface feedback through a custom controller. 
+You can have more customised logic and interface feedback through a custom controller. 
 Let's create a simple upload form (which is used for `MyDataObject` instances). 
 You'll need to add a route to your controller to make it accessible via URL 
 (see [director](/reference/director)).

docs/en/02_Developer_Guides/11_Integration/02_RSSFeed.md

@@ -144,7 +144,7 @@ Then in our controller, we add a new action which returns a the XML list of `Pla
 ### Customizing the RSS Feed template
 
 The default template used for XML view is `framework/templates/RSSFeed.ss`. This template displays titles and links to 
-the object. To customize the XML produced use `setTemplate`.
+the object. To customise the XML produced use `setTemplate`.
 
 Say from that last example we want to include the Players Team in the XML feed we might create the following XML file.
 

docs/en/02_Developer_Guides/11_Integration/How_Tos/Import_CSV_through_a_Controller.md

@@ -2,7 +2,7 @@ title: Import CSV Data through a Controller
 
 # Import CSV Data through a Controller
 
-You can have more customized logic and interface feedback through a custom controller. Let's create a simple upload 
+You can have more customised logic and interface feedback through a custom controller. Let's create a simple upload 
 form (which is used for `MyDataObject` instances). You can access it through 
 `http://yoursite.com/MyController/?flush=all`.
 

docs/en/02_Developer_Guides/14_Files/02_Images.md

@@ -157,7 +157,11 @@ and whenever you upload or modify an Image through SilverStripe.
 If you encounter problems with images not appearing, or have mysteriously 
 disappeared, you can try manually flushing the image cache.
 
-	http://localhost/dev/tasks/FlushGeneratedImagesTask
+	http://localhost/dev/tasks/RegenerateCachedImagesTask
+
+<div class="notice" markdown="1">
+This task was renamed to `RegenerateCachedImagesTask` (originally `FlushGeneratedImagesTask`) circa SilverStripe 3.2.
+</div>
 
 ## API Documentation
 [api:Image]

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md

@@ -169,7 +169,7 @@ model class, where you can add or remove columns. To change the title, use [api:
 
 The results list are retrieved from [api:SearchContext::getResults()], based on the parameters passed through the search
 form. If no search parameters are given, the results will show every record. Results are a [api:DataList] instance, so
-can be customized by additional SQL filters, joins.
+can be customised by additional SQL filters, joins.
 
 For example, we might want to exclude all products without prices in our sample `MyAdmin` implementation.
 
@@ -192,7 +192,7 @@ For example, we might want to exclude all products without prices in our sample
 		}
 	}
 
-You can also customize the search behavior directly on your `ModelAdmin` instance. For example, we might want to have a
+You can also customise the search behavior directly on your `ModelAdmin` instance. For example, we might want to have a
 checkbox which limits search results to expensive products (over $100).
 
 **mysite/code/MyAdmin.php**
@@ -300,7 +300,7 @@ with a more specific importer implementation, use the [api:ModelAdmin::$model_im
 Export is available as a CSV format through a button at the end of a results list. You can also export search results.
 This is handled through the [api:GridFieldExportButton] component.
 
-To customize the exported columns, create a new method called `getExportFields` in your `ModelAdmin`:
+To customise the exported columns, create a new method called `getExportFields` in your `ModelAdmin`:
 
 	:::php
 	<?php

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md

@@ -3,7 +3,7 @@ summary: Add custom CSS properties to the rich-text editor.
 
 # WYSIWYG Styles
 
-SilverStripe lets you customize the style of content in the CMS. This is done by setting up a CSS file called
+SilverStripe lets you customise the style of content in the CMS. This is done by setting up a CSS file called
 `editor.css` in either your theme or in your `mysite` folder. This is set through
 
 	:::php

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md

@@ -168,7 +168,7 @@ consideration, we provide a library for entwineUI style programming. In entwineU
 objects. entwine extends this concept beyond what is provided by other libraries to provide a very easy to use system
 with class like, ploymorphic, namespaced properties."
 
-Use jQuery.entwine when your code is likely to be customized by others, for example for most work in the CMS interface.
+Use jQuery.entwine when your code is likely to be customised by others, for example for most work in the CMS interface.
 It is also suited for more complex applications beyond a single-purpose plugin.
 
 Example: Highlighter

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md

@@ -1,4 +1,4 @@
-# How to customize the CMS Menu
+# How to customise the CMS Menu
 
 ## Adding an administration panel
 

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md

@@ -1,4 +1,4 @@
-# How to customize the CMS tree
+# How to customise the CMS tree
 
 ## Overview
 

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md

@@ -190,17 +190,45 @@ We can also easily create new drop-up menus by defining new tabs within the
 Empty tabs will be automatically removed from the `FieldList` to prevent clutter.
 </div>
 
-New actions will need associated controller handlers to work. You can use a
-`LeftAndMainExtension` to provide one. Refer to [Controller documentation](../../controllers)
-for instructions on setting up handlers.
-
 To make the actions more user-friendly you can also use alternating buttons as
 detailed in the [CMS Alternating Button](cms_alternating_button)
 how-to.
 
+### Implementing handlers
+
+Your newly created buttons need handlers to bind to before they will do anything.
+To implement these handlers, you will need to create a `LeftAndMainExtension` and add
+applicable controller actions to it:
+
+	:::php
+	class CustomActionsExtension extends LeftAndMainExtension {
+		
+		private static $allowed_actions = array(
+        	'sampleAction'
+    	);
+    	
+    	public function sampleAction()
+    	{
+    		// Create the web
+    	}
+    	
+    }
+    
+The extension then needs to be registered:
+
+	:::yaml
+	LeftAndMain:
+		extensions:
+			- CustomActionsExtension
+			
+You can now use these handlers with your buttons:
+
+	:::php
+	$fields->push(FormAction::create('sampleAction', 'Perform Sample Action'));
+
 ## Summary
 
-In a few lines of code, we've customized the look and feel of the CMS.
+In a few lines of code, we've customised the look and feel of the CMS.
 
 While this example is only scratching the surface, it includes most building
 blocks and concepts for more complex extensions as well.

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extending_An_Existing_ModelAdmin.md

@@ -1,6 +1,6 @@
 ## Extending existing ModelAdmin
 
-Sometimes you'll work with ModelAdmins from other modules. To customize these interfaces, you can always subclass. But there's
+Sometimes you'll work with ModelAdmins from other modules. To customise these interfaces, you can always subclass. But there's
 also another tool at your disposal: The [api:Extension] API.
 
 	:::php

docs/en/04_Changelogs/2.3.0.md

@@ -1154,7 +1154,7 @@ See http://open.silverstripe.com/changeset/69688
  * ![rev:63652] Added Controller->render($params) as a shortcut for Controller->customise($params)->renderWith(array('MyTemplate','MySubTemplate')) - templates are auto-detected by Controller->getViewer() and Controller->getAction()
  * ![rev:63651] Consistently allowing for $restrictFields and $fieldClasses parameters passed to DataObject->scaffoldFormFields(), DataObject->scaffoldSearchFields(), DataObject->scaffoldCMSFields()
  * ![rev:63650] Added RequestHandlingTest->testNestedBase()
- * ![rev:63648] Added support for customize parameters to ViewableData->renderWith() to avoid unnecessary chaining ($this->customize($params)->renderWith($template))
+ * ![rev:63648] Added support for customise parameters to ViewableData->renderWith() to avoid unnecessary chaining ($this->customise($params)->renderWith($template))
  * ![rev:63633] Better i18n for TableField and ComplexTableField
  * ![rev:63632] Using DataObject->Title for has_one dropdowns generated in DataObject->scaffoldFormFields()
  * ![rev:63630] Added DataObject->fieldLabel() and removed $fieldname parameter from DataObject->fieldLabels($fieldName) to simplify overloading of fieldLabels() for i18n
@@ -1788,7 +1788,7 @@ See http://open.silverstripe.com/changeset/69688
  * ![rev:64863] Changed default # of rows on HTMLEditorField from 15 to 30
  * ![rev:64862] Fixed TinyMCE stylihg
  * ![rev:64839] Fixed CMS uploading
- * ![rev:64814] call $this->extend('updateFieldLabels', $labels) in FieldLabels() to get its decorator's customized field labels
+ * ![rev:64814] call $this->extend('updateFieldLabels', $labels) in FieldLabels() to get its decorator's customised field labels
  * ![rev:64778] Removed scrubbing of the HTML
  * ![rev:64768] #2957 - Fixed entity decoding in Convert::html2raw
  * ![rev:64760] Fixed bug in tinymce_ssbuttons plugin inclusion

docs/en/04_Changelogs/2.4.1.md

@@ -206,7 +206,7 @@ existing pages when their title is changed.
  * [rev:106200] added prefix and suffix support to !ContextSummary
  * [rev:106194] Prevent image search queries all images in the site initially when the page is loaded
  * [rev:106178] Enable switch between legacy image search and new version
- * [rev:106118] added setRows() and setColumns() to customize the size of the textarea field outside of the controller
+ * [rev:106118] added setRows() and setColumns() to customise the size of the textarea field outside of the controller
  * [rev:105890] Added method for $this->request->latestParam() backwards compatibility with Director::urlParam()
  * [rev:105732] Ability to hide form by className or for the whole !ModelAdmin
  * [rev:105712] Added !MySQLDatabaseConfigurationHelper::getDatabaseVersion() which abstracts the version number away from the version check the installer requires

docs/en/04_Changelogs/2.4.2.md

@@ -2,7 +2,7 @@
 
  * Fixed a security issue where pages in draft mode might be visible to unauthenticated users
  * Fixed a security issue where users with access to admin/security (but limited privileges) can take over a known administrator account by changing its password
- * Allow Apache webserver to customized error pages in HTML, rather than Apache default styling
+ * Allow Apache webserver to customised error pages in HTML, rather than Apache default styling
  * Testing harness improvements: More verbose testing output, fixed coverage report generation
  * Fixed installer logic for SQLite database drivers
  * All unit tests pass on Windows OS/SQL Server
@@ -156,4 +156,4 @@
  * [109163] 
  * [109163] This reverts commit 1e7781ba2b8ac30333a20d9a1b0bcb9b4ba5b0b0.
  * [109099] Added dev/tests/emptydb to clear out test session databases.
- * [108417] Using htmlentities($keywords,ENT_NOQUOTES) instead of proposed solution
+ * [108417] Using htmlentities($keywords,ENT_NOQUOTES) instead of proposed solution

docs/en/04_Changelogs/3.0.0.md

@@ -348,7 +348,7 @@ See the [template reference](/developer_guides/templates) for a list of method r
 
 Most aspects of the interface have been redesigned, which necessitated a substantial
 redevelopment of the underlying logic and presentation. 
-If you have customized the admin interface in any way, please review
+If you have customised the admin interface in any way, please review
 the detailed changelog for this release. Many interface components have changed completely,
 unfortunately there is no clear upgrade path for every interface detail.
 As a starting point, have a look at the new templates in `cms/templates`

docs/en/04_Changelogs/3.1.0.md

@@ -421,7 +421,7 @@ you can enable those warnings and future-proof your code already.
    have custom code relying on these two libraries, please update your code to include the files yourself
  * Removed `SiteTree.MetaKeywords` since they are irrelevant in terms of SEO
    ([seomoz article](http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/)) and general page informancy
- * Removed `SiteTree.MetaTitle` as a means to customize the window title, use `SiteTree.Title` instead
+ * Removed `SiteTree.MetaTitle` as a means to customise the window title, use `SiteTree.Title` instead
  * Deprecated `Profiler` class, use third-party solutions like [xhprof](https://github.com/facebook/xhprof/)
  * Removed defunct or unnecessary debug GET parameters: 
    `debug_profile`, `debug_memory`, `profile_trace`, `debug_javascript`, `debug_behaviour`

docs/en/04_Changelogs/3.2.0.md

@@ -826,7 +826,7 @@ In order to remove the new "archive" action and restore the old "delete" action
  * 2015-07-10 [560f9a6](https://github.com/silverstripe/silverstripe-framework/commit/560f9a6e39df4f09dfe4bed5978f6dcddc0bb299) respect custom attributes on OptionsetField and CheckboxSetField (Damian Mooyman)
  * 2015-06-15 [f3e1472](https://github.com/silverstripe/silverstripe-cms/commit/f3e1472493b15758c67bb2c8814bc28765eac401) Revert DataObject::validate to 3.1 method signature (protected) (Damian Mooyman)
  * 2015-06-15 [58cc3da](https://github.com/silverstripe/silverstripe-framework/commit/58cc3da8d8005d6a367d88fb7c5d41c96dd8946f) Revert DataObject::validate to 3.1 method signature (protected) (Damian Mooyman)
- * 2015-06-13 [e766658](https://github.com/silverstripe/silverstripe-framework/commit/e766658ee3b9e70988b79d99d75124857f2a7ccc) Allow HTTP Cache Headers to be customized (Jeremy Shipman)
+ * 2015-06-13 [e766658](https://github.com/silverstripe/silverstripe-framework/commit/e766658ee3b9e70988b79d99d75124857f2a7ccc) Allow HTTP Cache Headers to be customised (Jeremy Shipman)
  * 2015-06-12 [8389260](https://github.com/silverstripe/silverstripe-framework/commit/838926085cac00ec65ee5aecb67e6102ea8b6f20) and renamed image functions (Jonathon Menz)
  * 2015-06-09 [914d734](https://github.com/silverstripe/silverstripe-framework/commit/914d734df004947eb869de2abb6fb2fc463be574) Disable deprecation notices by default (Damian Mooyman)
  * 2015-06-09 [a8ace75](https://github.com/silverstripe/silverstripe-framework/commit/a8ace7534194b5e1a636c96eca4607d08726dfeb) Support for multiple HTMLEditorConfig per page (Damian Mooyman)

docs/en/04_Changelogs/alpha/2.4.0-alpha1.md

@@ -43,7 +43,7 @@
  * [rev:88474] Refactored ViewableData. The main changes are:
  * [rev:88472] Added the Shortcode API (ShortcodeParser) to allow you to replace simple BBCode-like tags in a string with the results of a callback. From: Andrew Short
  * [rev:88468] Added utility methods to enable and disable nested URLs to SiteTree. From: Andrew Short
- * [rev:88104] added extend() call to enable FieldHolder() html to be customized via extensions.
+ * [rev:88104] added extend() call to enable FieldHolder() html to be customised via extensions.
  * [rev:85789] Added Widget_Controller class to enable nested forms within Wiget class.
 
 
@@ -382,4 +382,4 @@
  * [rev:84981] Ensure that DataObject->ClassName is set on object instantiation
  * [rev:84970] Made timing code for test runner more accurate (includes initial db build):
  * [rev:84814] ENHANCMENT: get svn merged revision 84806:84808 from branches/iss
- * [rev:84163] ENHANCMENT: Low-level performance improvements in database access.
+ * [rev:84163] ENHANCMENT: Low-level performance improvements in database access.

docs/en/04_Changelogs/alpha/3.0.0-alpha1.md

@@ -222,7 +222,7 @@ See [3.0.0 upgrading guide](../3.0.0) for further details.
  * 2011-07-05 [a1b8698](https://github.com/silverstripe/sapphire/commit/a1b8698) Removed '.LeftAndMain' selector from rules in order to avoid DOM hierarchy confusion (.LeftAndMain contains .cms-content vs .LeftAndMain equals .cms-content) (Ingo Schommer)
  * 2011-07-05 [19b9edb](https://github.com/silverstripe/sapphire/commit/19b9edb) Clearer CSS classes in CMS controller templates. Fixed JS loading of ModelAdmin panels. Added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag). Leaving $BaseCSSClasses in LeftAndMain.ss base template for legacy reasons. (Ingo Schommer)
  * 2011-07-05 [38db63c](https://github.com/silverstripe/silverstripe-cms/commit/38db63c) Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag) (Ingo Schommer)
- * 2011-07-04 [1dc9457](https://github.com/silverstripe/sapphire/commit/1dc9457) Using LeftAndMain->BaseCSSClasses() instead of ViewableData->CSSClasses() to avoid conflicts with customized controller objects (e.g. ModelAdmin_RecordController->edit()) (Ingo Schommer)
+ * 2011-07-04 [1dc9457](https://github.com/silverstripe/sapphire/commit/1dc9457) Using LeftAndMain->BaseCSSClasses() instead of ViewableData->CSSClasses() to avoid conflicts with customised controller objects (e.g. ModelAdmin_RecordController->edit()) (Ingo Schommer)
  * 2011-07-04 [c4a99df](https://github.com/silverstripe/silverstripe-cms/commit/c4a99df) Redirecting page links in CMSPagesController to CMSPageEditController (admin/pages/show/99 to admin/page/show/99) (Ingo Schommer)
  * 2011-07-04 [2e9ea1d](https://github.com/silverstripe/sapphire/commit/2e9ea1d) Disable ping until jQuery.entwine _super() confusion is resolved (Ingo Schommer)
  * 2011-06-25 [ebb1e0f](https://github.com/silverstripe/silverstripe-cms/commit/ebb1e0f) Additional HTML for tree styling in SiteTree->getTreeTitle() (Ed)
@@ -281,4 +281,4 @@ See [3.0.0 upgrading guide](../3.0.0) for further details.
  * 2011-06-23 [bb09555](https://github.com/silverstripe/sapphire/commit/bb09555) Forgot to remove this line in my last commit. (Colby Klein)
  * 2011-06-23 [1460789](https://github.com/silverstripe/sapphire/commit/1460789) Fix tabindex being present on read only form fields instead of regular ones. (Colby Klein)
  * 2011-06-08 [047d256](https://github.com/silverstripe/sapphire/commit/047d256) Updated return types for createTag and describe in documentation (Marijn Kampf)
- * 2011-03-18 [cae7791](https://github.com/silverstripe/sapphire/commit/cae7791) Allowing success and error callbacks in refresh() (Ingo Schommer)
+ * 2011-03-18 [cae7791](https://github.com/silverstripe/sapphire/commit/cae7791) Allowing success and error callbacks in refresh() (Ingo Schommer)

docs/en/04_Changelogs/beta/2.4.0-beta2.md

@@ -488,7 +488,7 @@
  * [rev:99112] migrated headers in SiteConfig to i18n'd (from r86429)
  * [rev:99111] Localized File->uploadMetadataFields()
  * [rev:99110] Documentation
- * [rev:99099] ability to customize the text that comes out of Member->Title
+ * [rev:99099] ability to customise the text that comes out of Member->Title
  * [rev:99099] updated workflow reports (from r96352)
  * [rev:99098] Added Requirements for SilverStripeNavigator (see r99080)
  * [rev:99097] Added Requirements for SilverStripeNavigator (see r99080)
@@ -552,4 +552,4 @@
  * [rev:99848] This reverts commit a0d2f7b3e289d12dedcdbd02ae52eec3e6718340.
  * [rev:99732] BUFGFIX: Prevent selection of self as parent (see #5106)
  * [rev:99084] Add missing JS file (from r97410)
- * [rev:98873] REVERT: reverse merging the change, it breaks some tests.
+ * [rev:98873] REVERT: reverse merging the change, it breaks some tests.

docs/en/04_Changelogs/beta/3.2.0-beta1.md

@@ -789,7 +789,7 @@ In order to remove the new "archive" action and restore the old "delete" action
 
  * 2015-06-16 [f3e1472](https://github.com/silverstripe/silverstripe-cms/commit/f3e1472) Revert DataObject::validate to 3.1 method signature (protected) (Damian Mooyman)
  * 2015-06-16 [58cc3da](https://github.com/silverstripe/sapphire/commit/58cc3da) Revert DataObject::validate to 3.1 method signature (protected) (Damian Mooyman)
- * 2015-06-13 [e766658](https://github.com/silverstripe/sapphire/commit/e766658) Allow HTTP Cache Headers to be customized (Jeremy Shipman)
+ * 2015-06-13 [e766658](https://github.com/silverstripe/sapphire/commit/e766658) Allow HTTP Cache Headers to be customised (Jeremy Shipman)
  * 2015-06-12 [8389260](https://github.com/silverstripe/sapphire/commit/8389260) New and renamed image functions (Jonathon Menz)
  * 2015-06-09 [a8ace75](https://github.com/silverstripe/sapphire/commit/a8ace75) Support for multiple HTMLEditorConfig per page (Damian Mooyman)
  * 2015-05-15 [b169823](https://github.com/silverstripe/silverstripe-cms/commit/b169823) Deprecate delete in favour of archive Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology Add pop-up verification to destructive actions Fix bug preventing side-by-side preview of archived pages Fix bug in reporting publishing of error pages Restoring a page without an available parent will restore to root (Damian Mooyman)

docs/en/04_Changelogs/pr/3.0.0-pr1.md

@@ -297,7 +297,7 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2009-11-21 [5f8a164](https://github.com/silverstripe/silverstripe-cms/commit/5f8a164) Defaulting to action_save button in ajaxSubmit() javascript logic in CMS form ENHANCEMENT Making ajax options overrideable in ajaxSubmit() javascript logic in CMS form (Ingo Schommer)
  * 2009-11-21 [b6dc2de](https://github.com/silverstripe/silverstripe-cms/commit/b6dc2de) Added initial implementation of jquery-changetracker as a replacement for the existing ChangeTracker behaviour/prototype javascript class (Ingo Schommer)
  * 2009-11-21 [bc2cad4](https://github.com/silverstripe/silverstripe-cms/commit/bc2cad4) Floating tinymce toolbar icons in CMS to allow for smaller widths without having tinymce hide the tabset scrollbars (Ingo Schommer)
- * 2009-11-21 [c2d24f9](https://github.com/silverstripe/silverstripe-cms/commit/c2d24f9) Changed CMSMain and LeftAndMain form submissions to return raw HTML instead of using FormResponse logic and evaluated javascript. This allows a more customizeable UI layer that is decoupled from the serverside logic. Any state changes should be propagated through the form itself. ENHANCEMENT Using new 'X-STATUS' HTTP response header for CMS form responses, as it is more robust for submitting variable length strings than the original 'Status' header. The status is evaluated in LeftAndMain.EditForm.js API CHANGE Removed CMSMain->tellBrowserAboutPublicationChange(), LeftAndMain->returnItemToUser(), LeftAndMain->getActionUpdateJS(), LeftAndMain->addTreeNodeJS(), LeftAndMain->deleteTreeNodeJS(). Use javascript to respond to state changes API CHANGE Removed CMSForm and CMSRightForm javascript classes, superseded by LeftAndMain.EditForm.js ENHANCEMENT Removed custom change detection in LeftAndMain->save(), this should be handled by DataObject->write() ENHANCEMENT Removed switch in LeftAndMain->save() which doesnt process saving if the record hasn't been altered, to simplify the saving logic ENHANCEMENT Removed custom add/remove tree node logic in LeftAndMain->save() which was retrieving state from DataObjectLog. This was never actively used, and should be handled by custom clientside logic. (Ingo Schommer)
+ * 2009-11-21 [c2d24f9](https://github.com/silverstripe/silverstripe-cms/commit/c2d24f9) Changed CMSMain and LeftAndMain form submissions to return raw HTML instead of using FormResponse logic and evaluated javascript. This allows a more customiseable UI layer that is decoupled from the serverside logic. Any state changes should be propagated through the form itself. ENHANCEMENT Using new 'X-STATUS' HTTP response header for CMS form responses, as it is more robust for submitting variable length strings than the original 'Status' header. The status is evaluated in LeftAndMain.EditForm.js API CHANGE Removed CMSMain->tellBrowserAboutPublicationChange(), LeftAndMain->returnItemToUser(), LeftAndMain->getActionUpdateJS(), LeftAndMain->addTreeNodeJS(), LeftAndMain->deleteTreeNodeJS(). Use javascript to respond to state changes API CHANGE Removed CMSForm and CMSRightForm javascript classes, superseded by LeftAndMain.EditForm.js ENHANCEMENT Removed custom change detection in LeftAndMain->save(), this should be handled by DataObject->write() ENHANCEMENT Removed switch in LeftAndMain->save() which doesnt process saving if the record hasn't been altered, to simplify the saving logic ENHANCEMENT Removed custom add/remove tree node logic in LeftAndMain->save() which was retrieving state from DataObjectLog. This was never actively used, and should be handled by custom clientside logic. (Ingo Schommer)
  * 2009-11-21 [41c1c49](https://github.com/silverstripe/silverstripe-cms/commit/41c1c49) Better response handling in LeftAndMain.EditForm BUGFIX Fixed event cancellation in LeftAndMain.EditForm javascript buttons (Ingo Schommer)
  * 2009-11-21 [87a6e33](https://github.com/silverstripe/silverstripe-cms/commit/87a6e33) Disabling validator in CMSMain->getCMSFields() unless its explicitly set through SiteTree->getCMSValidator(). We don't fully support validation in the CMS (yet), and it causes unnecessary bloat in the document body for now. (Ingo Schommer)
  * 2009-11-21 [021c8d4](https://github.com/silverstripe/silverstripe-cms/commit/021c8d4) Initialize the east layout panel in CMSMain.js as hidden, so users can't toggle it without going through tinyMCE buttons (Ingo Schommer)
@@ -320,7 +320,7 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2009-11-21 [d95f867](https://github.com/silverstripe/sapphire/commit/d95f867) Triggering jQuery events in TreeSelectorField.js in preparation to switching the tree logic to jQuery. This prevents developers from using the soon-to-be-deprecated Observable prototype (Ingo Schommer)
  * 2009-11-21 [28109df](https://github.com/silverstripe/sapphire/commit/28109df) Removed UniqueField.js dependency to CMS-related statusMessage() javascript class, and using jQuery even triggers instead (Ingo Schommer)
  * 2009-11-21 [0b25cb9](https://github.com/silverstripe/sapphire/commit/0b25cb9) Removed UpdateURL.js, moved logic to CMSMain.js ENHANCEMENT Using plain TextField for URLSegment in SiteTree->getCMSFields(), and using custom logic in CMSMain.js. The field didn't have any serverside validation anyway, and the remaining parts are quite custom (Ingo Schommer)
- * 2009-11-21 [f60e94b](https://github.com/silverstripe/sapphire/commit/f60e94b) Using native jQuery.getScript() in customized jQuery.ondemand plugin. Moved processDemandHeaders() into jQuery namespace, and adjusted customized prototype.js library (Ingo Schommer)
+ * 2009-11-21 [f60e94b](https://github.com/silverstripe/sapphire/commit/f60e94b) Using native jQuery.getScript() in customised jQuery.ondemand plugin. Moved processDemandHeaders() into jQuery namespace, and adjusted customised prototype.js library (Ingo Schommer)
  * 2009-11-21 [0abe472](https://github.com/silverstripe/sapphire/commit/0abe472) Added SiteTree->getStageURLSegment() and SiteTree->getLiveURLSegment() to allow auto-population in the CMS edit form. This information is necessary to keep clientside UI state consistent. (Ingo Schommer)
  * 2009-11-21 [9ecd359](https://github.com/silverstripe/sapphire/commit/9ecd359) Setting proper text/javascript content-type in FormResponse so clientside ajax-handling knows how to deal with it. (Ingo Schommer)
  * 2009-11-21 [beb4efe](https://github.com/silverstripe/sapphire/commit/beb4efe) Disabling form validation for right-panel forms in CMS in HtmlEditorField. None of the fields have validation attached to them at the moment, so the generic validation output is unnecessary bloat. (Ingo Schommer)
@@ -1238,7 +1238,7 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2010-04-14 [4703aa6](https://github.com/silverstripe/sapphire/commit/4703aa6) Fixed SapphireTest->logInWithPermission() spelling (from r99491) (Ingo Schommer)
  * 2010-04-14 [76d57b6](https://github.com/silverstripe/sapphire/commit/76d57b6) Temporarily disabled nested url specific cases inTranslatableTest->testAlternateGetByLink(), unclear functionality requirements (from r99350) (Ingo Schommer)
  * 2010-04-14 [e99d56d](https://github.com/silverstripe/sapphire/commit/e99d56d) Localized File->uploadMetadataFields() (from r99111) (Ingo Schommer)
- * 2010-04-14 [ae7439a](https://github.com/silverstripe/sapphire/commit/ae7439a) ability to customize the text that comes out of Member->Title MINOR updated workflow reports (from r96352) (from r99099) (Ingo Schommer)
+ * 2010-04-14 [ae7439a](https://github.com/silverstripe/sapphire/commit/ae7439a) ability to customise the text that comes out of Member->Title MINOR updated workflow reports (from r96352) (from r99099) (Ingo Schommer)
  * 2010-04-14 [3dc4486](https://github.com/silverstripe/sapphire/commit/3dc4486) Added Requirements for SilverStripeNavigator (see r99080) (from r99097) (Ingo Schommer)
  * 2010-04-14 [ec983ae](https://github.com/silverstripe/sapphire/commit/ec983ae) make static caching smarter around cacheSubdirs (from r99076) (Ingo Schommer)
  * 2010-04-14 [7c057cb](https://github.com/silverstripe/sapphire/commit/7c057cb) adjustments to ensure that the cached permissions were actually hit (from r98835) (from r99068) (Ingo Schommer)
@@ -1398,7 +1398,7 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2009-11-21 [e3a51fe](https://github.com/silverstripe/silverstripe-cms/commit/e3a51fe) Bugfixes for SWFUpload (Ingo Schommer)
  * 2009-11-21 [394e0c0](https://github.com/silverstripe/silverstripe-cms/commit/394e0c0) Removed cms/thirdparty/swfupload, moved to sapphire/thirdparty (Ingo Schommer)
  * 2009-11-21 [683dfa9](https://github.com/silverstripe/silverstripe-cms/commit/683dfa9) Styling of side reports and tree area in CMS (Ingo Schommer)
- * 2009-11-21 [1bc268e](https://github.com/silverstripe/silverstripe-cms/commit/1bc268e) Only fetching EditForm in LeftAndMain->show() if called by ajax, the customize() call for non-ajax views confuses the renderer otherwise (Ingo Schommer)
+ * 2009-11-21 [1bc268e](https://github.com/silverstripe/silverstripe-cms/commit/1bc268e) Only fetching EditForm in LeftAndMain->show() if called by ajax, the customise() call for non-ajax views confuses the renderer otherwise (Ingo Schommer)
  * 2009-11-21 [32d6342](https://github.com/silverstripe/silverstripe-cms/commit/32d6342) Fixed merge errors (Ingo Schommer)
  * 2009-11-21 [8f92ee3](https://github.com/silverstripe/silverstripe-cms/commit/8f92ee3) Fixed Requirements paths in LeftAndMain.php (Ingo Schommer)
  * 2009-11-21 [c189230](https://github.com/silverstripe/silverstripe-cms/commit/c189230) Fixed merge error (Ingo Schommer)
@@ -1561,8 +1561,8 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2009-11-21 [9889ba5](https://github.com/silverstripe/sapphire/commit/9889ba5) Moved Function.prototype.create from tree.js into behaviour.js (Ingo Schommer)
  * 2009-11-21 [146979b](https://github.com/silverstripe/sapphire/commit/146979b) Documentation and code formatting for jquery.ondemand.js (Ingo Schommer)
  * 2009-11-21 [073ebbe](https://github.com/silverstripe/sapphire/commit/073ebbe) Moved sapphire/javascript/core to sapphire/javascript/jquery-ondemand to fit with patterns in sapphire/thirdparty (Ingo Schommer)
- * 2009-11-21 [fd1cb12](https://github.com/silverstripe/sapphire/commit/fd1cb12) Removed unused sapphire/thirdparty/jquery.ondemand.js library, we use a heavily customized version in sapphire/javascript/jquery-ondemand instead (Ingo Schommer)
+ * 2009-11-21 [fd1cb12](https://github.com/silverstripe/sapphire/commit/fd1cb12) Removed unused sapphire/thirdparty/jquery.ondemand.js library, we use a heavily customised version in sapphire/javascript/jquery-ondemand instead (Ingo Schommer)
- * 2009-11-21 [5d6233a](https://github.com/silverstripe/sapphire/commit/5d6233a) Indentation in customized jquery.ondemand.js (Ingo Schommer)
+ * 2009-11-21 [5d6233a](https://github.com/silverstripe/sapphire/commit/5d6233a) Indentation in customised jquery.ondemand.js (Ingo Schommer)
  * 2009-11-21 [1b138d6](https://github.com/silverstripe/sapphire/commit/1b138d6) Removed layout_helpers.js dependency (Ingo Schommer)
  * 2009-11-21 [df1766b](https://github.com/silverstripe/sapphire/commit/df1766b) Removed unused css/CalendarDateField.css (Ingo Schommer)
  * 2009-11-21 [2fc966c](https://github.com/silverstripe/sapphire/commit/2fc966c) Removed loader.js dependencies (Ingo Schommer)
@@ -1676,4 +1676,4 @@ See [3.0.0 upgrading guide](../3.0.0)
  * 2009-11-19 [19c7e11](https://github.com/silverstripe/silverstripe-installer/commit/19c7e11) added mysite theme (from r71148) (ischommer)
  * 2009-11-19 [e361bea](https://github.com/silverstripe/silverstripe-installer/commit/e361bea) removed tutorial files (from r71147) (ischommer)
  * 2009-11-19 [3c07e8b](https://github.com/silverstripe/silverstripe-installer/commit/3c07e8b) ... (from r71146) (ischommer)
- * 2009-11-19 [5bb0d9b](https://github.com/silverstripe/silverstripe-installer/commit/5bb0d9b) Removed DirectorySlash update from installer's default htaccess as it breaks some installation targets (from r67085) (ischommer)
+ * 2009-11-19 [5bb0d9b](https://github.com/silverstripe/silverstripe-installer/commit/5bb0d9b) Removed DirectorySlash update from installer's default htaccess as it breaks some installation targets (from r67085) (ischommer)

docs/en/04_Changelogs/rc/2.4.1-rc1.md

@@ -47,7 +47,7 @@
  * [rev:106200] added prefix and suffix support to ContextSummary
  * [rev:106194] Prevent image search queries all images in the site initially when the page is loaded
  * [rev:106178] Enable switch between legacy image search and new version
- * [rev:106118] added setRows() and setColumns() to customize the size of the textarea field outside of the controller
+ * [rev:106118] added setRows() and setColumns() to customise the size of the textarea field outside of the controller
  * [rev:105890] Added method for $this->request->latestParam() backwards compatibility with Director::urlParam()
  * [rev:105732] Ability to hide form by className or for the whole ModelAdmin
  * [rev:105712] Added MySQLDatabaseConfigurationHelper::getDatabaseVersion() which abstracts the version number away from the version check the installer requires
@@ -325,4 +325,4 @@
  * [rev:104667] Added explicit bash handler to sake
  * [rev:104442] Multi-use redemption page created
 
-`./sscreatechangelog --version 2.4.1-rc1 --branch branches/2.4 --stopbranch tags/2.4.0`
+`./sscreatechangelog --version 2.4.1-rc1 --branch branches/2.4 --stopbranch tags/2.4.0`

filesystem/File.php

@@ -752,7 +752,9 @@ class File extends DataObject {
 		if($this->ParentID) {
 			// Don't use the cache, the parent has just been changed
 			$p = DataObject::get_by_id('Folder', $this->ParentID, false);
-			if($p && $p->exists()) return $p->getRelativePath() . $this->getField("Name");
+			if($p && $p->isInDB()) {
+				return $p->getRelativePath() . $this->getField("Name");
+			}
 			else return ASSETS_DIR . "/" . $this->getField("Name");
 		} else if($this->getField("Name")) {
 			return ASSETS_DIR . "/" . $this->getField("Name");

filesystem/Folder.php

@@ -165,6 +165,7 @@ class Folder extends File {
 
 				// Check allowed extensions, unless admin users are allowed to bypass these exclusions
 				if($checkExtensions
+					&& !is_dir($baseDir . $actualChild)
 					&& ($extension = self::get_file_extension($actualChild))
 					&& !in_array(strtolower($extension), $allowedExtensions)
 				) {

forms/gridfield/GridField.php

@@ -501,11 +501,14 @@ class GridField extends FormField {
 			$header . "\n" . $footer . "\n" . $body
 		);
 
-		return DBField::create_field('HTMLText', FormField::create_tag(
+		$field = DBField::create_field('HTMLText', FormField::create_tag(
 			'fieldset',
 			$fieldsetAttributes,
 			$content['before'] . $table . $content['after']
 		));
+		$field->setOptions(array('shortcodes' => false));
+
+		return $field;
 	}
 
 	/**

main.php

@@ -94,6 +94,7 @@ if (isset($_GET['url']) && php_sapi_name() !== 'cli-server') {
 
 	// Lighttpd and PHP 5.4's built-in webserver use this
 } else {
+	// Get raw URL -- still needs to be decoded below (after parsing out query string).
 	$url = $_SERVER['REQUEST_URI'];
 
 	// Querystring args need to be explicitly parsed
@@ -102,6 +103,9 @@ if (isset($_GET['url']) && php_sapi_name() !== 'cli-server') {
 		$parseQuery($query);
 	}
 
+	// Decode URL now that it has been separated from query string.
+	$url = urldecode($url);
+
 	// Pass back to the webserver for files that exist
 	if(php_sapi_name() === 'cli-server' && file_exists(BASE_PATH . $url) && is_file(BASE_PATH . $url)) {
 		return false;

model/Image.php

@@ -1044,7 +1044,9 @@ class Image extends File implements Flushable {
 	}
 
 	protected function onBeforeDelete() {
-		$backend = Injector::inst()->create(self::get_backend());
+		$backend = Injector::inst()->createWithArgs(self::config()->backend, array(
+			Director::baseFolder()."/" . $this->Filename		
+		));
 		$backend->onBeforeDelete($this);
 
 		$this->deleteFormattedImages();

model/Versioned.php

@@ -818,9 +818,14 @@ class Versioned extends DataExtension implements TemplateGlobalProvider {
 			return true;
 		}
 
+		// If there are less than 2 stages, we can exit early since comparing stages is not needed
+		if(count($this->stages) < 2){
+			return true;
+		}
+
 		// If we weren't definitely loaded from live, and we can't view non-live content, we need to
-		// check to make sure this version is the live version and so can be viewed
+		// check to make sure this version is the live version and so can be viewed.
-		$latestVersion = Versioned::get_versionnumber_by_stage($this->owner->class, 'Live', $this->owner->ID);
+		$latestVersion = Versioned::get_versionnumber_by_stage($this->owner->class, $this->liveStage, $this->owner->ID);
 		if ($latestVersion == $this->owner->Version) {
 			// Even if this is loaded from a non-live stage, this is the live version
 			return true;

model/connect/DBSchemaManager.php

@@ -310,15 +310,14 @@ abstract class DBSchemaManager {
 
 			// Check if options changed
 			$tableOptionsChanged = false;
-			if (isset($options[get_class($this)]) || true) {
+			// Check for DB constant on the schema class
-				if (isset($options[get_class($this)])) {
+			$dbIDName = sprintf('%s::ID', get_class($this));
-					if (preg_match('/ENGINE=([^\s]*)/', $options[get_class($this)], $alteredEngineMatches)) {
+			$dbID = defined($dbIDName) ? constant($dbIDName) : null;
-						$alteredEngine = $alteredEngineMatches[1];
+			if ($dbID && isset($options[$dbID])) {
-						$tableStatus = $this->query(sprintf(
+				if (preg_match('/ENGINE=([^\s]*)/', $options[$dbID], $alteredEngineMatches)) {
-												'SHOW TABLE STATUS LIKE \'%s\'', $table
+					$alteredEngine = $alteredEngineMatches[1];
-										))->first();
+					$tableStatus = $this->query(sprintf('SHOW TABLE STATUS LIKE \'%s\'', $table))->first();
-						$tableOptionsChanged = ($tableStatus['Engine'] != $alteredEngine);
+					$tableOptionsChanged = ($tableStatus['Engine'] != $alteredEngine);
-					}
 				}
 			}
 

model/connect/MySQLSchemaManager.php

@@ -84,7 +84,8 @@ class MySQLSchemaManager extends DBSchemaManager {
 			}
 		}
 
-		if ($alteredOptions && isset($alteredOptions[get_class($this)])) {
+		$dbID = self::ID;
+		if ($alteredOptions && isset($alteredOptions[$dbID])) {
 			$indexList = $this->indexList($tableName);
 			$skip = false;
 			foreach ($indexList as $index) {
@@ -98,14 +99,14 @@ class MySQLSchemaManager extends DBSchemaManager {
 					sprintf(
 						"Table %s options not changed to %s due to fulltextsearch index",
 						$tableName,
-						$alteredOptions[get_class($this)]
+						$alteredOptions[$dbID]
 					),
 					"changed"
 				);
 			} else {
-				$this->query(sprintf("ALTER TABLE \"%s\" %s", $tableName, $alteredOptions[get_class($this)]));
+				$this->query(sprintf("ALTER TABLE \"%s\" %s", $tableName, $alteredOptions[$dbID]));
 				$this->alterationMessage(
-					sprintf("Table %s options changed: %s", $tableName, $alteredOptions[get_class($this)]),
+					sprintf("Table %s options changed: %s", $tableName, $alteredOptions[$dbID]),
 					"changed"
 				);
 			}

model/queries/SQLSelect.php

@@ -568,14 +568,12 @@ class SQLSelect extends SQLConditionalExpression {
 
 
 	/**
-	 * Return the number of rows in this query if the limit were removed.  Useful in paged data sets.
+	 * Return the number of rows in this query, respecting limit and offset.
-	 *
-	 * @todo Respect HAVING and GROUPBY, which can affect the result-count
 	 *
 	 * @param string $column Quoted, escaped column name
 	 * @return int
 	 */
-	public function count( $column = null) {
+	public function count($column = null) {
 		// we can't clear the select if we're relying on its output by a HAVING clause
 		if(!empty($this->having)) {
 			$records = $this->execute();

tests/control/HTTPRequestTest.php

@@ -254,4 +254,23 @@ class HTTPRequestTest extends SapphireTest {
 		$this->assertEquals('home?test=1', $req->getURL(true));
 		$this->assertEquals('home', $req->getURL());
 	}
+
+	public function testGetIPFromHeaderValue() {
+		$req = new SS_HTTPRequest('GET', '/');
+		$reflectionMethod = new ReflectionMethod($req, 'getIPFromHeaderValue');
+		$reflectionMethod->setAccessible(true);
+
+		$headers = array(
+			'80.79.208.21, 149.126.76.1, 10.51.0.68' => '80.79.208.21',
+			'52.19.19.103, 10.51.0.49' => '52.19.19.103',
+			'10.51.0.49, 52.19.19.103' => '52.19.19.103',
+			'10.51.0.49' => '10.51.0.49',
+			'127.0.0.1, 10.51.0.49' => '127.0.0.1',
+		);
+
+		foreach ($headers as $header => $ip) {
+			$this->assertEquals($ip, $reflectionMethod->invoke($req, $header));
+		}
+
+	}
 }

tests/core/startup/ErrorControlChainTest.php

@@ -63,7 +63,11 @@ require_once '$classpath';
 
 class ErrorControlChainTest extends SapphireTest {
 
+	protected $displayErrors = null;
+
 	function setUp() {
+		$this->displayErrors = (bool)ini_get('display_errors');
+
 		// Check we can run PHP at all
 		$null = is_writeable('/dev/null') ? '/dev/null' : 'NUL';
 		exec("php -v 2> $null", $out, $rv);
@@ -76,8 +80,48 @@ class ErrorControlChainTest extends SapphireTest {
 		parent::setUp();
 	}
 
+	public function tearDown() {
+		if($this->displayErrors !== null) {
+			ini_set('display_errors', $this->displayErrors);
+			$this->displayErrors = null;
+		}
+		parent::tearDown(); // TODO: Change the autogenerated stub
+	}
+
 	function testErrorSuppression() {
 
+		// Errors disabled by default
+		ini_set('display_errors', false);
+		$chain = new ErrorControlChain();
+		$whenNotSuppressed = null;
+		$whenSuppressed = null;
+		$chain->then(function($chain) use(&$whenNotSuppressed, &$whenSuppressed) {
+			$chain->setSuppression(true);
+			$whenSuppressed = ini_get('display_errors');
+			$chain->setSuppression(false);
+			$whenNotSuppressed = ini_get('display_errors');
+		})->execute();
+
+		// Disabled errors never un-disable
+		$this->assertFalse((bool)$whenNotSuppressed);
+		$this->assertFalse((bool)$whenSuppressed);
+
+		// Errors enabled by default
+		ini_set('display_errors', true);
+		$chain = new ErrorControlChain();
+		$whenNotSuppressed = null;
+		$whenSuppressed = null;
+		$chain->then(function($chain) use(&$whenNotSuppressed, &$whenSuppressed) {
+			$chain->setSuppression(true);
+			$whenSuppressed = ini_get('display_errors');
+			$chain->setSuppression(false);
+			$whenNotSuppressed = ini_get('display_errors');
+		})->execute();
+
+		// Errors can be suppressed an un-suppressed when initially enabled
+		$this->assertTrue((bool)$whenNotSuppressed);
+		$this->assertFalse((bool)$whenSuppressed);
+
 		// Fatal error
 
 		$chain = new ErrorControlChainTest_Chain();

tests/model/VersionedTest.php

@@ -812,6 +812,7 @@ class VersionedTest extends SapphireTest {
 		$public1ID = $this->idFromFixture('VersionedTest_PublicStage', 'public1');
 		$public2ID = $this->idFromFixture('VersionedTest_PublicViaExtension', 'public2');
 		$privateID = $this->idFromFixture('VersionedTest_DataObject', 'page1');
+		$singleID = $this->idFromFixture('VersionedTest_SingleStage', 'single');
 
 		// Test that all (and only) public pages are viewable in stage mode
 		Session::clear("loggedInAs");
@@ -819,16 +820,21 @@ class VersionedTest extends SapphireTest {
 		$public1 = Versioned::get_one_by_stage('VersionedTest_PublicStage', 'Stage', array('"ID"' => $public1ID));
 		$public2 = Versioned::get_one_by_stage('VersionedTest_PublicViaExtension', 'Stage', array('"ID"' => $public2ID));
 		$private = Versioned::get_one_by_stage('VersionedTest_DataObject', 'Stage', array('"ID"' => $privateID));
+		// Also test an object that has just a single-stage (eg. is only versioned)
+		$single = Versioned::get_one_by_stage('VersionedTest_SingleStage', 'Stage', array('"ID"' => $singleID));
+
 
 		$this->assertTrue($public1->canView());
 		$this->assertTrue($public2->canView());
 		$this->assertFalse($private->canView());
+		$this->assertFalse($single->canView());
 
 		// Adjusting the current stage should not allow objects loaded in stage to be viewable
 		Versioned::reading_stage('Live');
 		$this->assertTrue($public1->canView());
 		$this->assertTrue($public2->canView());
 		$this->assertFalse($private->canView());
+		$this->assertFalse($single->canView());
 
 		// Writing the private page to live should be fine though
 		$private->publish("Stage", "Live");
@@ -854,6 +860,7 @@ class VersionedTest extends SapphireTest {
 		$this->assertTrue($public1->canView());
 		$this->assertTrue($public2->canView());
 		$this->assertTrue($private->canView());
+		$this->assertTrue($single->canView());
 	}
 
 

tests/model/VersionedTest.yml

@@ -30,3 +30,7 @@ VersionedTest_AnotherSubclass:
   subclass1:
     Title: 'Subclass Page 1'
     AnotherField: 'Bob'
+
+VersionedTest_SingleStage:
+  single:
+    Title: 'Singlestage Title'

tests/security/MemberTest.php

@@ -185,16 +185,42 @@ class MemberTest extends FunctionalTest {
 	 * Test that changed passwords will send an email
 	 */
 	public function testChangedPasswordEmaling() {
+		Config::inst()->update('Member', 'notify_password_change', true);
+
 		$this->clearEmails();
 
 		$member = $this->objFromFixture('Member', 'test');
 		$this->assertNotNull($member);
 		$valid = $member->changePassword('32asDF##$$%%');
 		$this->assertTrue($valid->valid());
-		/*
+
-		$this->assertEmailSent("sam@silverstripe.com", null, "/changed password/",
+		$this->assertEmailSent('testuser@example.com', null, 'Your password has been changed',
-		'/sam@silverstripe\.com.*32asDF##\$\$%%/');
+			'/testuser@example\.com/');
-		*/
+
+	}
+
+	/**
+	 * Test that triggering "forgotPassword" sends an Email with a reset link
+	 */
+	public function testForgotPasswordEmaling() {
+		$this->clearEmails();
+		$this->autoFollowRedirection = false;
+
+		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
+
+		// Initiate a password-reset
+		$response = $this->post('Security/LostPasswordForm', array('Email' => $member->Email));
+
+		$this->assertEquals($response->getStatusCode(), 302);
+
+		// We should get redirected to Security/passwordsent
+		$this->assertContains('Security/passwordsent/testuser@example.com',
+			urldecode($response->getHeader('Location')));
+
+		// Check existance of reset link
+		$this->assertEmailSent("testuser@example.com", null, 'Your password reset link',
+			'/Security\/changepassword\?m='.$member->ID.'&t=[^"]+/');
 	}
 
 	/**

tests/security/MemberTest.yml

@@ -42,7 +42,7 @@ Member:
   test:
     FirstName: Test
     Surname: User
-    Email: sam@silverstripe.com
+    Email: testuser@example.com
     Password: 1nitialPassword
     PasswordExpiry: 2030-01-01
     Groups: =>Group.securityadminsgroup

tests/security/SecurityTest.php

@@ -301,13 +301,13 @@ class SecurityTest extends FunctionalTest {
 	 */
 	public function testExpiredPassword() {
 		/* BAD PASSWORDS ARE LOCKED OUT */
-		$badResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'badpassword');
+		$badResponse = $this->doTestLoginForm('testuser@example.com' , 'badpassword');
 		$this->assertEquals(302, $badResponse->getStatusCode());
 		$this->assertRegExp('/Security\/login/', $badResponse->getHeader('Location'));
 		$this->assertNull($this->session()->inst_get('loggedInAs'));
 
 		/* UNEXPIRED PASSWORD GO THROUGH WITHOUT A HITCH */
-		$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword');
+		$goodResponse = $this->doTestLoginForm('testuser@example.com' , '1nitialPassword');
 		$this->assertEquals(302, $goodResponse->getStatusCode());
 		$this->assertEquals(
 			Controller::join_links(Director::absoluteBaseURL(), 'test/link'),
@@ -336,7 +336,7 @@ class SecurityTest extends FunctionalTest {
 	}
 
 	public function testChangePasswordForLoggedInUsers() {
-		$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword');
+		$goodResponse = $this->doTestLoginForm('testuser@example.com' , '1nitialPassword');
 
 		// Change the password
 		$this->get('Security/changepassword?BackURL=test/back');
@@ -349,7 +349,7 @@ class SecurityTest extends FunctionalTest {
 		$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
 
 		// Check if we can login with the new password
-		$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'changedPassword');
+		$goodResponse = $this->doTestLoginForm('testuser@example.com' , 'changedPassword');
 		$this->assertEquals(302, $goodResponse->getStatusCode());
 		$this->assertEquals(
 			Controller::join_links(Director::absoluteBaseURL(), 'test/link'),
@@ -368,9 +368,9 @@ class SecurityTest extends FunctionalTest {
 
 		// Request new password by email
 		$response = $this->get('Security/lostpassword');
-		$response = $this->post('Security/LostPasswordForm', array('Email' => 'sam@silverstripe.com'));
+		$response = $this->post('Security/LostPasswordForm', array('Email' => 'testuser@example.com'));
 
-		$this->assertEmailSent('sam@silverstripe.com');
+		$this->assertEmailSent('testuser@example.com');
 
 		// Load password link from email
 		$admin = DataObject::get_by_id('Member', $admin->ID);
@@ -390,7 +390,7 @@ class SecurityTest extends FunctionalTest {
 		$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
 
 		// Check if we can login with the new password
-		$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'changedPassword');
+		$goodResponse = $this->doTestLoginForm('testuser@example.com' , 'changedPassword');
 		$this->assertEquals(302, $goodResponse->getStatusCode());
 		$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
 
@@ -408,7 +408,7 @@ class SecurityTest extends FunctionalTest {
 
 		// Login with a wrong password for more than the defined threshold
 		for($i = 1; $i <= Member::config()->lock_out_after_incorrect_logins+1; $i++) {
-			$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
+			$this->doTestLoginForm('testuser@example.com' , 'incorrectpassword');
 			$member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
 
 			if($i < Member::config()->lock_out_after_incorrect_logins) {
@@ -438,7 +438,7 @@ class SecurityTest extends FunctionalTest {
 			}
 		}
 
-		$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword');
+		$this->doTestLoginForm('testuser@example.com' , '1nitialPassword');
 		$this->assertNull(
 			$this->session()->inst_get('loggedInAs'),
 			'The user can\'t log in after being locked out, even with the right password'
@@ -448,7 +448,7 @@ class SecurityTest extends FunctionalTest {
 		$member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
 		$member->LockedOutUntil = date('Y-m-d H:i:s', time() - 30);
 		$member->write();
-		$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword');
+		$this->doTestLoginForm('testuser@example.com' , '1nitialPassword');
 		$this->assertEquals(
 			$this->session()->inst_get('loggedInAs'),
 			$member->ID,
@@ -460,7 +460,7 @@ class SecurityTest extends FunctionalTest {
 
 		// Login again with wrong password, but less attempts than threshold
 		for($i = 1; $i < Member::config()->lock_out_after_incorrect_logins; $i++) {
-			$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
+			$this->doTestLoginForm('testuser@example.com' , 'incorrectpassword');
 		}
 		$this->assertNull($this->session()->inst_get('loggedInAs'));
 		$this->assertContains(
@@ -469,7 +469,7 @@ class SecurityTest extends FunctionalTest {
 			'The user can retry with a wrong password after the lockout expires'
 		);
 
-		$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword');
+		$this->doTestLoginForm('testuser@example.com' , '1nitialPassword');
 		$this->assertEquals(
 			$this->session()->inst_get('loggedInAs'),
 			$member->ID,
@@ -484,8 +484,8 @@ class SecurityTest extends FunctionalTest {
 
 		// ATTEMPTING LOG-IN TWICE WITH ONE ACCOUNT AND TWICE WITH ANOTHER SHOULDN'T LOCK ANYBODY OUT
 
-		$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
+		$this->doTestLoginForm('testuser@example.com' , 'incorrectpassword');
-		$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
+		$this->doTestLoginForm('testuser@example.com' , 'incorrectpassword');
 
 		$this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword');
 		$this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword');
@@ -499,7 +499,7 @@ class SecurityTest extends FunctionalTest {
 		// BUT, DOING AN ADDITIONAL LOG-IN WITH EITHER OF THEM WILL LOCK OUT, SINCE THAT IS THE 3RD FAILURE IN
 		// THIS SESSION
 
-		$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
+		$this->doTestLoginForm('testuser@example.com' , 'incorrectpassword');
 		$member1 = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
 		$this->assertNotNull($member1->LockedOutUntil);
 
@@ -512,16 +512,16 @@ class SecurityTest extends FunctionalTest {
 		Security::config()->login_recording = true;
 
 		/* UNSUCCESSFUL ATTEMPTS WITH WRONG PASSWORD FOR EXISTING USER ARE LOGGED */
-		$this->doTestLoginForm('sam@silverstripe.com', 'wrongpassword');
+		$this->doTestLoginForm('testuser@example.com', 'wrongpassword');
 		$attempt = DataObject::get_one('LoginAttempt', array(
-			'"LoginAttempt"."Email"' => 'sam@silverstripe.com'
+			'"LoginAttempt"."Email"' => 'testuser@example.com'
 		));
 		$this->assertTrue(is_object($attempt));
 		$member = DataObject::get_one('Member', array(
-			'"Member"."Email"' => 'sam@silverstripe.com'
+			'"Member"."Email"' => 'testuser@example.com'
 		));
 		$this->assertEquals($attempt->Status, 'Failure');
-		$this->assertEquals($attempt->Email, 'sam@silverstripe.com');
+		$this->assertEquals($attempt->Email, 'testuser@example.com');
 		$this->assertEquals($attempt->Member(), $member);
 
 		/* UNSUCCESSFUL ATTEMPTS WITH NONEXISTING USER ARE LOGGED */
@@ -541,16 +541,16 @@ class SecurityTest extends FunctionalTest {
 		Security::config()->login_recording = true;
 
 		/* SUCCESSFUL ATTEMPTS ARE LOGGED */
-		$this->doTestLoginForm('sam@silverstripe.com', '1nitialPassword');
+		$this->doTestLoginForm('testuser@example.com', '1nitialPassword');
 		$attempt = DataObject::get_one('LoginAttempt', array(
-			'"LoginAttempt"."Email"' => 'sam@silverstripe.com'
+			'"LoginAttempt"."Email"' => 'testuser@example.com'
 		));
 		$member = DataObject::get_one('Member', array(
-			'"Member"."Email"' => 'sam@silverstripe.com'
+			'"Member"."Email"' => 'testuser@example.com'
 		));
 		$this->assertTrue(is_object($attempt));
 		$this->assertEquals($attempt->Status, 'Success');
-		$this->assertEquals($attempt->Email, 'sam@silverstripe.com');
+		$this->assertEquals($attempt->Email, 'testuser@example.com');
 		$this->assertEquals($attempt->Member(), $member);
 	}