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

修正Route类

Browse Source
This commit is contained in:
thinkphp
2016-05-24 17:55:05 +08:00
parent e936d7dc7d
commit 901631b8d5
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Route.php
View File

@@ -401,7 +401,8 @@ class Route
if (strpos($val[1], ':id') && isset($option['var'][$rule])) {
$val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]);
}
self::rule($rule . $val[1] . '$', $route . '/' . $val[2], $val[0], $option, $pattern);
$rule = $rule . $val[1];
self::rule($rule ? $rule . '$' : '', $route . '/' . $val[2], $val[0], $option, $pattern);
}
}
}

7
tests/thinkphp/baseTest.php
View File

@@ -46,12 +46,5 @@ class baseTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(!is_null(IS_CGI));
$this->assertTrue(!is_null(IS_WIN));
$this->assertTrue(!is_null(IS_CLI));
$this->assertTrue(is_bool(IS_AJAX));
$this->assertNotEmpty(NOW_TIME);
$this->assertNotEmpty(REQUEST_METHOD);
$this->assertTrue(is_bool(IS_GET));
$this->assertTrue(is_bool(IS_POST));
$this->assertTrue(is_bool(IS_PUT));
$this->assertTrue(is_bool(IS_DELETE));
}
}