From 81fa6b30a2af20e84ffadaa4bcf8dbb72002f182 Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Wed, 7 Mar 2018 12:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=87=A0=E5=A4=84=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Upload.php          | 2 +-
 application/common/controller/Admin.php          | 2 +-
 application/common/view/default/form/editor.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Upload.php b/application/admin/controller/Upload.php
index aba69de8..8a27854e 100644
--- a/application/admin/controller/Upload.php
+++ b/application/admin/controller/Upload.php
@@ -14,7 +14,7 @@ class Upload extends Admin {
 
 	public function _empty() {
 		$controller = controller('common/Upload');
-		$action     = ACTION_NAME;
+		$action     = $this->request->action();
 		return $controller->$action();
 	}
 }
\ No newline at end of file
diff --git a/application/common/controller/Admin.php b/application/common/controller/Admin.php
index c67786c2..98734c1c 100644
--- a/application/common/controller/Admin.php
+++ b/application/common/controller/Admin.php
@@ -175,7 +175,7 @@ class Admin extends Base {
 		$models = AuthGroup::getAuthModels(session('user_auth.uid'));
 		foreach ($list as $key => $value) {
 			if (IS_ROOT || in_array($value['id'], $models)) {
-				if ('admin/content/index' == $this->url && input('model_id') == $value['id']) {
+				if ('admin/content/index' == $this->request->path() && input('model_id') == $value['id']) {
 					$value['style'] = "active";
 				}
 				$value['url']   = "admin/content/index?model_id=" . $value['id'];
diff --git a/application/common/view/default/form/editor.html b/application/common/view/default/form/editor.html
index 53505238..324b34a0 100644
--- a/application/common/view/default/form/editor.html
+++ b/application/common/view/default/form/editor.html
@@ -2,6 +2,6 @@
 <!-- 实例化编辑器代码 -->
 <script type="text/javascript">
 	 var ue = UE.getEditor('{$field}', {
-	 	serverUrl : "{:url(MODULE_NAME.'/upload/ueditor')}"
+	 	serverUrl : "{:url(request()->module().'/upload/ueditor')}"
 	 });
 </script>
\ No newline at end of file