From 6bedd432f86d437971989061c3da1ff71fdc2fde Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Sun, 18 Jul 2021 20:02:12 +0700
Subject: [PATCH] Fix frontend edit weblink URL

---
 .../components/com_weblinks/src/Service/HTML/Icon.php           | 2 +-
 src/components/com_weblinks/src/Service/Router.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
index a56ae4a..35ece5b 100644
--- a/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
+++ b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php
@@ -137,7 +137,7 @@ class Icon
 		}
 
 		$weblinkUrl = RouteHelper::getWeblinkRoute($weblink->slug, $weblink->catid, $weblink->language);
-		$url        = $weblinkUrl . '&task=weblink.edit&id=' . $weblink->id . '&return=' . base64_encode($uri);
+		$url        = $weblinkUrl . '&task=weblink.edit&w_id=' . $weblink->id . '&return=' . base64_encode($uri);
 
 		if ((int) $weblink->state === 0)
 		{
diff --git a/src/components/com_weblinks/src/Service/Router.php b/src/components/com_weblinks/src/Service/Router.php
index 6a6e195..cd6e22c 100644
--- a/src/components/com_weblinks/src/Service/Router.php
+++ b/src/components/com_weblinks/src/Service/Router.php
@@ -90,7 +90,7 @@ class Router extends RouterView
 		$webLink->setKey('id')->setParent($category, 'catid');
 		$this->registerView($webLink);
 		$form = new RouterViewConfiguration('form');
-		$form->setKey('id');
+		$form->setKey('w_id');
 		$this->registerView($form);
 
 		parent::__construct($app, $menu);