From 00b55f49f1bde797fc76869561345538df17cc14 Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Tue, 2 Aug 2016 18:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4request=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=EF=BC=8C=E5=86=85=E6=A0=B8=E5=B7=B2=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/public/base.html | 2 +-
 application/common/controller/Base.php  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/admin/view/public/base.html b/application/admin/view/public/base.html
index 8b024e1e..122a30c7 100644
--- a/application/admin/view/public/base.html
+++ b/application/admin/view/public/base.html
@@ -207,7 +207,7 @@
 												{if $meta_title}
 												<span>{$meta_title}</span>
 												{else/}
-												<span>{:lang($request->controller().'_'.$request->action())}</span>
+												<span>{:lang($Request->controller().'_'.$Request->action())}</span>
 												{/if}
 											</li>
 										</ol>
diff --git a/application/common/controller/Base.php b/application/common/controller/Base.php
index 38d69437..4ebca11b 100644
--- a/application/common/controller/Base.php
+++ b/application/common/controller/Base.php
@@ -137,7 +137,6 @@ class Base extends \think\Controller{
 
 	//request信息
 	protected function requestInfo(){
-		$this->request    = \think\Request::instance();
 		$this->param = $this->request->param();
 		defined('MODULE_NAME') or define('MODULE_NAME', $this->request->module());
 		defined('CONTROLLER_NAME') or define('CONTROLLER_NAME', $this->request->controller());
@@ -145,7 +144,6 @@ class Base extends \think\Controller{
 		defined('IS_POST') or define('IS_POST', $this->request->isPost());
 		defined('IS_GET') or define('IS_GET', $this->request->isGet());
 		$this->url = $this->request->module() . '/' . $this->request->controller() . '/' . $this->request->action();
-		$this->assign('request',$this->request);
 		$this->assign('param',$this->param);
 	}