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

Merge pull request #207 from hainuo/patch-1

Browse Source 
修正一处函数名拼写错误
This commit is contained in:
ThinkPHP
2016-07-10 01:17:42 -05:00
committed by GitHub
parent 6c99692e32 11183898d7
commit b855cef14a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -199,7 +199,7 @@ class Route
if (is_array($val)) { if (is_array($val)) {
$route = $val[0]; $route = $val[0];
$option1 = array_merge($option, $val[1]); $option1 = array_merge($option, $val[1]);
$pattern1 = array_merege($pattern, isset($val[2]) ? $val[2] : []); $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
} else { } else {
$route = $val; $route = $val;
} }