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

修复几处notice报错

Browse Source
This commit is contained in:
luofei614
2015-12-08 05:01:50 -05:00
parent 192dfa1b7c
commit 4db4a228a2
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/lang.php
View File

@@ -53,6 +53,9 @@ class Lang
$range = $range ? $range : self::$range;
$lang = is_file($file) ? include $file : [];
// 批量定义
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, '/');