From d3e390e3fe7bcef9e90fa6ba71b2aa9622ba7ccd Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 23 Feb 2021 17:00:21 +0900
Subject: [PATCH] Prepare for downgrade from future version where domain_srl
 may be duplicate

---
 modules/admin/admin.admin.view.php       | 2 +-
 modules/module/queries/getDomainInfo.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index b7c1100dd..d482b625f 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -695,7 +695,7 @@ class adminAdminView extends admin
 		$domain_info = null;
 		if ($domain_srl !== '')
 		{
-			$domain_info = getModel('module')->getSiteInfo($domain_srl);
+			$domain_info = ModuleModel::getSiteInfo($domain_srl);
 			if ($domain_info->domain_srl != $domain_srl)
 			{
 				throw new Rhymix\Framework\Exception('msg_domain_not_found');
diff --git a/modules/module/queries/getDomainInfo.xml b/modules/module/queries/getDomainInfo.xml
index 7ee7aba4a..09801fd88 100644
--- a/modules/module/queries/getDomainInfo.xml
+++ b/modules/module/queries/getDomainInfo.xml
@@ -6,11 +6,12 @@
 	<columns>
 		<column name="domains.*" />
 		<column name="modules.*" />
+		<column name="domains.domain_srl" alias="domain_srl" />
 	</columns>
-    <conditions>
+	<conditions>
 		<condition operation="equal" column="modules.module_srl" default="domains.index_module_srl" notnull="notnull" />
-		<condition operation="equal" column="domain_srl" var="domain_srl" pipe="and" />
-        <condition operation="equal" column="domain" var="domain" pipe="and" />
-		<condition operation="equal" column="is_default_domain" var="is_default_domain" pipe="and" />
+		<condition operation="equal" column="domains.domain_srl" var="domain_srl" pipe="and" />
+		<condition operation="equal" column="domains.domain" var="domain" pipe="and" />
+		<condition operation="equal" column="domains.is_default_domain" var="is_default_domain" pipe="and" />
 	</conditions>
 </query>