Merge branch '4.4-dev' into sockets-for-system-tests

joomla · Sep 26, 2024 · ce35190 · ce35190
2 parents 67d3753 + 0461c99
commit ce35190
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -268,6 +268,12 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
      */
     public static function loadActionLogPluginsLanguage()
     {
+        static $loaded;
+        if ($loaded) {
+            return;
+        }
+        $loaded = true;
+
         $lang = Factory::getLanguage();
         $db   = Factory::getDbo();
 

diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -998,7 +998,7 @@ protected function populateState()
 
         $this->setState('item.type', $type);
 
-        $link = $app->isClient('api') ? $app->getInput()->get('link') :
+        $link = $app->isClient('api') ? $app->getInput()->get('link', null, 'string') :
             $app->getUserState('com_menus.edit.item.link');
 
         if ($link) {