[4.0] Fix wrong link to category on user action log (#32280)

* Fix wrong link to category on User action log

* Correct link to edit category form

* Only get extension from category if it is not passed in the input

Author: joomdonation

administrator/components/com_categories/src/Controller/CategoryController.php

@@ -153,6 +153,18 @@ public function batch($model = null)
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
 		$append = parent::getRedirectToItemAppend($recordId);
+
+		// In case extension is not passed in the URL, get it directly from category instead of default to com_content
+		if (!$this->input->exists('extension') && $recordId > 0)
+		{
+			$table = $this->getModel('Category')->getTable();
+
+			if ($table->load($recordId))
+			{
+				$this->extension = $table->extension;
+			}
+		}
+
 		$append .= '&extension=' . $this->extension;
 
 		return $append;

plugins/actionlog/joomla/joomla.php

@@ -96,23 +96,21 @@ public function onContentAfterSave($context, $article, $isNew): void
 			$context = $this->contextAliases[$context];
 		}
 
-		$option = $this->app->input->getCmd('option');
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
 
-		if (!$this->checkLoggable($option))
+		// Not found a valid content type, don't process further
+		if ($params === null)
 		{
 			return;
 		}
 
-		$params = ActionlogsHelper::getLogContentTypeParams($context);
+		list($option, $contentType) = explode('.', $params->type_alias);
 
-		// Not found a valid content type, don't process further
-		if ($params === null)
+		if (!$this->checkLoggable($option))
 		{
 			return;
 		}
 
-		list(, $contentType) = explode('.', $params->type_alias);
-
 		if ($isNew)
 		{
 			$messageLanguageKey = $params->text_prefix . '_' . $params->type_title . '_ADDED';