Merge pull request #10062 from silverstripe/3.7

Merge up 3.7

docs/en/02_Developer_Guides/09_Security/02_Permissions.md

@@ -67,7 +67,7 @@ Making this work well is a subtle business and should be discussed with a few de
 
 ## Using permissions
 
-*  On an individual data record, $page->can("View", $member = null) and be called.  If a member isn't passed, the
+*  On an individual data record, $page->can("View", $member = null) can be called.  If a member isn't passed, the
 currently logged in member is assumed.
 *  On a request, $request->hasPermission("View", $member = null) can be called.  See [datamodel](/developer_guides/model/permissions) for
 information on request objects.

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

@@ -94,6 +94,7 @@ Example:
 	$members = Member::get()->where(sprintf('"Name" = %s', Convert::raw2sql($_GET['name'], true))); 
 
 ```
+[warning]
 It is NOT good practice to "be sure" and convert the data passed to the functions above manually. This might
 result in *double escaping* and alters the actually saved data (e.g. by adding slashes to your content).
 [/warning]

model/connect/DBSchemaManager.php

@@ -317,7 +317,8 @@ abstract class DBSchemaManager {
 				if (preg_match('/ENGINE=([^\s]*)/', $options[$dbID], $alteredEngineMatches)) {
 					$alteredEngine = $alteredEngineMatches[1];
 					$tableStatus = $this->query(sprintf('SHOW TABLE STATUS LIKE \'%s\'', $table))->first();
-					$tableOptionsChanged = ($tableStatus['Engine'] != $alteredEngine);
+					$engine = isset($tableStatus['Engine']) ? $tableStatus['Engine'] : null;
+					$tableOptionsChanged = ($engine != $alteredEngine);
 				}
 			}
 

parsers/HTML/HTMLBBCodeParser.php

@@ -502,7 +502,8 @@ class SSHTMLBBCodeParser
 				{
 					if (trim($tag['text']) == '') {
 						//just an empty indentation or newline without value?
-						continue;
+						//skip this iteration of the foreach loop
+						continue 2;
 					}
 					$newTagArray[] = $child;
 					$openTags[] = $child['tag'];