Merge branch '3.5' into 3.6

composer.json

@@ -17,7 +17,8 @@
 	],
 	"require": {
 		"php": ">= 5.3.3, <7.2",
-		"composer/installers": "~1.0"
+		"composer/installers": "~1.0",
+		"mustangostang/spyc": "^0.6.2"
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7"

dev/YamlFixture.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'thirdparty/spyc/spyc.php';
-
 /**
  * Uses the Spyc library to parse a YAML document (see http://yaml.org).
  * YAML is a simple markup languages that uses tabs and colons instead of the more verbose XML tags,

security/MemberAuthenticator.php

@@ -161,9 +161,10 @@ public static function authenticate($data, Form $form = null) {
 		// when we can rehash passwords to a different hashing algorithm,
 		// bulk-migration doesn't work due to the nature of hashing.
 		// See PasswordEncryptor_LegacyPHPHash class.
-		if($success && $member && isset(self::$migrate_legacy_hashes[$member->PasswordEncryption])) {
+		$migrateLegacyHashes = self::config()->migrate_legacy_hashes;
+		if($success && $member && isset($migrateLegacyHashes[$member->PasswordEncryption])) {
 			$member->Password = $data['Password'];
-			$member->PasswordEncryption = self::$migrate_legacy_hashes[$member->PasswordEncryption];
+			$member->PasswordEncryption = $migrateLegacyHashes[$member->PasswordEncryption];
 			$member->write();
 		}
 

templates/forms/HtmlEditorField_holder_small.ss

@@ -0,0 +1,5 @@
+<div class="fieldholder-small field htmleditor">
+    <% if $Title %><label class="fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$Title</label><% end_if %>
+    $Field
+    <% if $RightTitle %><label class="right fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$RightTitle</label><% end_if %>
+</div>