Merge branch '6.2' into 6

Author: github-actions[bot]

client/src/legacy/CMSMain.EditForm.js

@@ -70,7 +70,7 @@ $.entwine('ss', function($){
 		 *
 		 * Update the related fields if appropriate
 		 * (String) title The new title
-		 * (Stirng) origTitle The original title
+		 * (String) origTitle The original title
 		 */
 		updateRelatedFields: function(title, origTitle) {
 			// Update these fields only if their value was originally the same as the title

code/Controllers/CMSMain.php

@@ -1209,7 +1209,7 @@ public function getRecordTreeMarkup(DataObject $record): string
         $record->invokeWithExtensions('updateTreeIconClasses', $iconClasses);
         $titleText = $record->getTreeTitle();
         // Hierarchy::getTreeTitle() will call Convert::raw2xml(), though this may have been
-        // overriden by another method that doesn't call this
+        // overridden by another method that doesn't call this
         // Check to see if it was converted first by calling the xml2raw() to before calling
         // raw2xml() to ensure we don't double convert and end up with "&"
         $wasChanged = Convert::xml2raw($titleText) !== $titleText;
@@ -1419,7 +1419,7 @@ public function getEditForm($id = null, $fields = null): Form
 
         $this->extend('updateEditForm', $form);
 
-        // Use custom reqest handler for LeftAndMain requests;
+        // Use custom request handler for LeftAndMain requests;
         // CMS Forms cannot be identified solely by name, but also need ID (and sometimes OtherID)
         $form->setRequestHandler(
             LeftAndMainFormRequestHandler::create($form, [$id])

code/Controllers/CMSSiteTreeFilter.php

@@ -7,14 +7,14 @@
 use SilverStripe\ORM\DataList;
 
 /**
- * Base class for filtering againt SiteTree for certain statuses (e.g. archived or draft only).
+ * Base class for filtering against SiteTree for certain statuses (e.g. archived or draft only).
  */
 abstract class CMSSiteTreeFilter
 {
     use Injectable;
 
     /**
-     * Returns a sorted array of all implementators of CMSSiteTreeFilter, suitable for use in a dropdown.
+     * Returns a sorted array of all implementers of CMSSiteTreeFilter, suitable for use in a dropdown.
      *
      * @return array<string, CMSSiteTreeFilter>
      */

code/Controllers/CMSSiteTreeFilter_Search.php

@@ -13,7 +13,7 @@ public static function title(): string
     }
 
     /**
-     * Retun an array of maps containing the keys, 'ID' and 'ParentID' for each page to be displayed
+     * Returns an array of maps containing the keys, 'ID' and 'ParentID' for each page to be displayed
      * in the search.
      */
     public function getFilteredPages(DataList $list): DataList

code/Controllers/ContentController.php

@@ -318,12 +318,13 @@ public function SilverStripeNavigator()
             if ($member) {
                 $firstname = Convert::raw2xml($member->FirstName);
                 $surname = Convert::raw2xml($member->Surname);
-                $logInMessage = _t(__CLASS__ . '.LOGGEDINAS', 'Logged in as') . " {$firstname} {$surname} - <a href=\"Security/logout\">" . _t(__CLASS__ . '.LOGOUT', 'Log out') . "</a>";
+                $logoutUrl = Convert::raw2att(Security::logout_url());
+                $logInMessage = _t(__CLASS__ . '.LOGGEDINAS', 'Logged in as') . " {$firstname} {$surname} - <a href=\"{$logoutUrl}\">" . _t(__CLASS__ . '.LOGOUT', 'Log out') . "</a>";
             } else {
                 $logInMessage = sprintf(
                     '%s - <a href="%s">%s</a>',
                     _t(__CLASS__ . '.NOTLOGGEDIN', 'Not logged in'),
-                    Security::config()->login_url,
+                    Convert::raw2att(Security::login_url()),
                     _t(__CLASS__ . '.LOGIN', 'Login') . "</a>"
                 );
             }

code/Model/SiteTree.php

@@ -894,7 +894,7 @@ public function getParent()
      * Return a string of the form "parent - page" or "grandparent - parent - page" using page titles
      *
      * @param int $level The maximum amount of levels to traverse.
-     * @param string $separator Seperating string
+     * @param string $separator Separating string
      * @return string The resulting string
      */
     public function NestedTitle($level = 2, $separator = " - ")
@@ -1705,7 +1705,7 @@ public function generateURLSegment($title)
         $filter = URLSegmentFilter::create();
         $filteredTitle = $filter->filter($title);
 
-        // Fallback to generic page name if path is empty (= no valid, convertable characters)
+        // Fallback to generic page name if path is empty (= no valid, convertible characters)
         if (!$filteredTitle || $filteredTitle == '-' || $filteredTitle == '-1') {
             $filteredTitle = "page-$this->ID";
         }
@@ -1789,7 +1789,7 @@ public function BackLinkTracking()
     /**
      * Returns the pages that depend on this page. This includes virtual pages, pages that link to it, etc.
      *
-     * @param bool $includeVirtuals Set to false to exlcude virtual pages.
+     * @param bool $includeVirtuals Set to false to exclude virtual pages.
      * @return ArrayList<SiteTree>
      */
     public function DependentPages($includeVirtuals = true)
@@ -2413,7 +2413,7 @@ protected function onAfterPublish()
     }
 
     /**
-     * Update draft dependant pages
+     * Update draft dependent pages
      */
     protected function onAfterRevertToLive()
     {
@@ -2605,7 +2605,7 @@ public function getPageLevel()
 
     /**
      * Find the controller name by our convention of {$ModelClass}Controller
-     * Can be overriden by config variable
+     * Can be overridden by config variable
      *
      * @return string
      */
@@ -2665,7 +2665,7 @@ public function updateCMSTreeClasses(string &$classes): void
 
     /**
      * Stops extendCMSFields() being called on getCMSFields(). This is useful when you need access to fields added by
-     * subclasses of SiteTree in a extension. Call before calling parent::getCMSFields(), and reenable afterwards.
+     * subclasses of SiteTree in a extension. Call before calling parent::getCMSFields(), and re-enable afterwards.
      */
     public static function disableCMSFieldsExtensions()
     {
@@ -2787,7 +2787,7 @@ public static function flush()
     }
 
     /**
-     * Update dependant pages
+     * Update dependent pages
      */
     protected function updateDependentPages()
     {

code/Model/SiteTreeLinkTracking.php

@@ -154,7 +154,7 @@ protected function onAfterDelete()
     }
 
     /**
-     * Scrape the content of a field to detect anly links to local SiteTree pages or files
+     * Scrape the content of a field to detect any links to local SiteTree pages or files
      *
      * @param string $fieldName The name of the field on {@link @owner} to scrape
      * @param bool &$anyBroken Will be flagged to true (by reference) if a link is broken.

code/Model/VirtualPage.php

@@ -18,7 +18,7 @@
 
 /**
  * Virtual Page creates an instance of a  page, with the same fields that the original page had, but readonly.
- * This allows you can have a page in mulitple places in the site structure, with different children without
+ * This allows you can have a page in multiple places in the site structure, with different children without
  * duplicating the content.
  *
  * Note: This Only duplicates $db fields and not the $has_one etc..

tests/behat/src/LoginContext.php

@@ -28,7 +28,7 @@ public function pagesShouldBeEditableBy($negative, $permCode)
         $member = $this->generateMemberWithPermission($email, $password, $permCode);
         $canEdit = strstr($negative ?? '', 'not') ? false : true;
         // Flush the SiteConfig cache so that siteconfig behat tests that update a
-        // SiteConfig DataObject will not be referring to a stale verion of itself
+        // SiteConfig DataObject will not be referring to a stale version of itself
         // which can happen because SiteConfig::current_site_config() uses a cached query
         SiteConfig::current_site_config()->flushCache();
         if ($canEdit) {

tests/behat/src/ThemeContext.php

@@ -87,7 +87,7 @@ protected function requireDir($dirname)
     public function cleanThemesAfterScenario()
     {
         // Restore any created/modified files.
-        //  - If modified, revert then to original contnet
+        //  - If modified, revert then to original content
         //  - If created, delete them
         if ($this->restoreFiles) {
             foreach ($this->restoreFiles as $file => $origContent) {