From bfd89eaed5785c2a658c7f6b9ba82bf308270ee6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 27 Mar 2016 17:35:47 +0800
Subject: [PATCH] =?UTF-8?q?app=5Fbegin=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20=E6=8E=A7=E5=88=B6=E5=99=A8=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=BB=98=E8=AE=A4=E5=8F=98=E9=87=8F=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?v?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php        | 2 +-
 library/think/App.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/convention.php b/convention.php
index 3b72df25..255afbc1 100644
--- a/convention.php
+++ b/convention.php
@@ -72,7 +72,7 @@ return [
     // 获取当前页面地址的系统变量 默认为REQUEST_URI
     'url_request_uri'        => 'REQUEST_URI',
     // 控制器版本参数
-    'var_version'            => 'version',
+    'var_version'            => 'v',
     // 基础URL路径
     'base_url'               => $_SERVER["SCRIPT_NAME"],
     // URL伪静态后缀
diff --git a/library/think/App.php b/library/think/App.php
index baed07cf..857a733f 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -73,7 +73,7 @@ class App
         // 记录路由信息
         APP_DEBUG && Log::record('[ ROUTE ] ' . var_export(self::$dispatch, true), 'info');
         // 监听app_begin
-        APP_HOOK && Hook::listen('app_begin');
+        APP_HOOK && Hook::listen('app_begin', self::$dispatch);
 
         // 根据类型调度
         switch (self::$dispatch['type']) {