Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-11-18

Author: richard67

administrator/components/com_admin/script.php

@@ -3163,11 +3163,11 @@ protected function fixFilenameCasing()
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.2.2
      *
      * @todo    6.0 Remove this method
      *
-     * @deprecated  __DEPLOY_VERSION__ will be removed in 6.0 without replacement
+     * @deprecated  5.2.2 will be removed in 6.0 without replacement
      */
     protected function fixFilesystemPermissions()
     {

administrator/components/com_admin/sql/updates/mysql/5.2.1-2024-09-24.sql renamed to administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql

@@ -28,7 +28,7 @@ class StepController extends FormController
      *
      * @return  string  The arguments to append to the redirect URL.
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  5.2.2
      */
     protected function getRedirectToListAppend()
     {

administrator/components/com_admin/sql/updates/postgresql/5.2.1-2024-09-24.sql renamed to administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql

@@ -17,7 +17,7 @@
 /**
  * Provider Account is empty or not set exception.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.2.2
  */
 class ProviderAccountIsEmptyException extends \Exception
 {

administrator/components/com_guidedtours/src/Controller/StepController.php

@@ -17,7 +17,7 @@
 /**
  * Provider Account not found exception.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.2.2
  */
 class ProviderAccountNotFoundException extends \Exception
 {

administrator/components/com_media/src/Exception/ProviderAccountIsEmptyException.php

@@ -17,7 +17,7 @@
 /**
  * Provider not found exception.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.2.2
  */
 class ProviderNotFoundException extends \Exception
 {

administrator/components/com_media/src/Exception/ProviderAccountNotFoundException.php

@@ -147,7 +147,7 @@ public function __destruct()
     /**
      * Prevent object injection attacks by suppressing unserialization of instance with deferred rows
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  5.2.2
      *
      * @throws \Exception
      */

administrator/components/com_media/src/Exception/ProviderNotFoundException.php

@@ -48,15 +48,15 @@ class AdministratorMenuItem extends MenuItem
      * The class of the menu item
      *
      * @var string
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.2
      */
     public $class = '';
 
     /**
      * The element type of the menu item
      *
      * @var string
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.2
      */
     public $element = '';
 }

libraries/src/Log/Logger/FormattedtextLogger.php

@@ -185,7 +185,7 @@ private function addLoginCSSAndJavascript(): void
         }
 
         if (!$wa->assetExists('script', 'plg_system_webauthn.login')) {
-            $wa->registerScript('plg_system_webauthn.login', 'plg_system_webauthn/login.js', [], ['defer' => true], ['core']);
+            $wa->registerScript('plg_system_webauthn.login', 'plg_system_webauthn/login.js', [], ['defer' => true], ['core', 'messages']);
         }
 
         $wa->useStyle('plg_system_webauthn.button')