Merge pull request #207 from hainuo/patch-1

修正一处函数名拼写错误
2026-07-01 20:52:48 +08:00 · 2016-07-10 01:17:42 -05:00
parent 6c99692e32 11183898d7
commit b855cef14a
1 changed files with 1 additions and 1 deletions
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -199,7 +199,7 @@ class Route
                if (is_array($val)) {
                    $route    = $val[0];
                    $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 {
                    $route = $val;
                }