From e4a5bc671f3cf1a9ff18fac0fed2d5e8a26a35fa Mon Sep 17 00:00:00 2001
From: Octavian Cinciu <octavian@rsjoomla.com>
Date: Wed, 31 Jan 2018 10:56:53 +0200
Subject: [PATCH] Inherit Itemid from current URL if option matches

---
 libraries/src/Router/SiteRouter.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index 6dbabc1ea02a2..183c5e840bd67 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -724,6 +724,14 @@ protected function createUri($url)
 					$uri->setVar('Itemid', $itemid);
 				}
 			}
+			else
+			{
+				// If option matches, inherit current Itemid
+				if ($this->getVar('option') === $uri->getVar('option') && ($itemid = $this->getVar('Itemid')))
+				{
+					$uri->setVar('Itemid', $itemid);
+				}
+			}
 		}
 		else
 		{