mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 07:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/liu21st/think

Browse Source
This commit is contained in:
thinkphp
2015-12-08 18:29:25 +08:00
parent 3cf65dd413 4db4a228a2
commit 393629d61c
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/org/slog.php
View File

@@ -189,7 +189,7 @@ class Slog
protected static function check()
{
if (!self::$config['enable']) {
if (!SLOG_ON) {
return false;
}
$tabid = self::getClientArg('tabid');

3
library/think/lang.php
View File

@@ -59,6 +59,9 @@ class Lang
self::$lang[$range] = [];
}
// 批量定义
if(!isset(self::$lang[$range])) {
self::$lang[$range] = [];
}
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
}

4
library/think/route.php
View File

@@ -327,7 +327,7 @@ class Route
/**
* 检查正则路由
*/
private function checkRegex($route, $url, $matches)
private static function checkRegex($route, $url, $matches)
{
// 正则路由
if ($route instanceof \Closure) {
@@ -341,7 +341,7 @@ class Route
/**
* 检查规则路由
*/
private function checkRule($rule, $route, $url, $pattern)
private static function checkRule($rule, $route, $url, $pattern)
{
$len1 = substr_count($url, '/');
$len2 = substr_count($rule, '/');