Merge branch '5.2-dev' into content-module

joomla · Jun 13, 2024 · 3a75ffd · 3a75ffd
2 parents e6b48da + d156859
commit 3a75ffd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -1128,7 +1128,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
                     ];
                     $metaPath = Path::find($metadataFolders, 'metadata.xml');
 
-                    if (is_file($path = Path::clean($metaPath))) {
+                    if ($metaPath !== false && is_file($path = Path::clean($metaPath))) {
                         $formFile = $path;
                     }
                 } elseif ($base) {

diff --git a/api/components/com_installer/src/Controller/LanguagesController.php b/api/components/com_installer/src/Controller/LanguagesController.php
@@ -19,23 +19,23 @@
 /**
  * The manage controller
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.2.0
  */
 class LanguagesController extends ApiController
 {
     /**
      * The content type of the item.
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  5.2.0
      */
     protected $contentType = 'languages';
 
     /**
      * The default view for the display method.
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  5.2.0
      */
     protected $default_view = 'languages';
 }
diff --git a/api/components/com_installer/src/View/Languages/JsonapiView.php b/api/components/com_installer/src/View/Languages/JsonapiView.php
@@ -19,15 +19,15 @@
 /**
  * The languages view
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.2.0
  */
 class JsonapiView extends BaseApiView
 {
     /**
      * The fields to render item in the documents
      *
      * @var  array
-     * @since  __DEPLOY_VERSION__
+     * @since  5.2.0
      */
     protected $fieldsToRenderList = [
         'name',
@@ -46,7 +46,7 @@ class JsonapiView extends BaseApiView
      *
      * @return  object
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.2.0
      */
     protected function prepareItem($item)
     {

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -90,16 +90,15 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '3-June-2024';
+    public const RELDATE = '13-June-2024';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-
-    public const RELTIME = '20:06';
+    public const RELTIME = '08:48';
 
     /**
      * Release timezone.

diff --git a/plugins/filesystem/local/src/Extension/Local.php b/plugins/filesystem/local/src/Extension/Local.php
@@ -133,7 +133,10 @@ public function getAdapters()
                 $directoryEntity->thumbs,
                 [200, 200]
             );
-            $adapter->setCurrentUser($this->getApplication()->getIdentity());
+
+            if ($this->getApplication()->getIdentity()) {
+                $adapter->setCurrentUser($this->getApplication()->getIdentity());
+            }
 
             $adapters[$adapter->getAdapterName()] = $adapter;
         }