From d2a523e462263e3057b5c4264300f45c47d98281 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 8 Mar 2018 22:29:29 +0800
Subject: [PATCH] 修复一键生成文档在PHP5下的BUG 修复后台刷新导致的链接的错误
---
application/admin/command/Addon.php | 3 +--
application/common/controller/Backend.php | 9 ++++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/application/admin/command/Addon.php b/application/admin/command/Addon.php
index 0231d91..8c09824 100644
--- a/application/admin/command/Addon.php
+++ b/application/admin/command/Addon.php
@@ -2,7 +2,6 @@
namespace app\admin\command;
-use app\common\library\Menu;
use think\addons\AddonException;
use think\addons\Service;
use think\Config;
@@ -67,7 +66,7 @@ class Addon extends Command
}
mkdir($addonDir);
mkdir($addonDir . DS . 'controller');
- $menuList = Menu::export($name);
+ $menuList = \app\common\library\Menu::export($name);
$createMenu = $this->getCreateMenu($menuList);
$prefix = Config::get('database.prefix');
$createTableSql = '';
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 2613f29..5ef3105 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -144,7 +144,14 @@ class Backend extends Controller
$url = preg_replace_callback("/([\?|&]+)ref=addtabs(&?)/i", function($matches) {
return $matches[2] == '&' ? $matches[1] : '';
}, $this->request->url());
- $url = url($url, '', false);
+ if (Config::get('url_domain_deploy'))
+ {
+ if (stripos($url, $this->request->server('SCRIPT_NAME')) === 0)
+ {
+ $url = substr($url, strlen($this->request->server('SCRIPT_NAME')));
+ }
+ $url = url($url, '', false);
+ }
$this->redirect('index/index', [], 302, ['referer' => $url]);
exit;
}
--
libgit2 0.24.0