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

修正Driver驱动的一处sql组装解析的BUG

Browse Source
This commit is contained in:
thinkphp
2016-01-27 14:56:47 +08:00
parent 4c5dd3f151
commit 89cf4aea52
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -368,7 +368,7 @@ class Route
$pattern = $val['pattern']; $pattern = $val['pattern'];
// 参数有效性检查 // 参数有效性检查
if (!self::checkOption($option)) { if (!self::checkOption($option, $url)) {
continue; continue;
} }
@@ -387,7 +387,7 @@ class Route
if (is_array($route)) { if (is_array($route)) {
$option1 = $route[1]; $option1 = $route[1];
// 检查参数有效性 // 检查参数有效性
if (!self::checkOption($option1)) { if (!self::checkOption($option1, $url)) {
continue; continue;
} }
$pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []); $pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []);
@@ -453,14 +453,14 @@ class Route
} }
// 路由参数有效性检查 // 路由参数有效性检查
private static function checkOption($option) private static function checkOption($option, $url)
{ {
// 请求类型检测 // 请求类型检测
if ((isset($option['method']) && false === stripos($option['method'], REQUEST_METHOD)) if ((isset($option['method']) && false === stripos($option['method'], REQUEST_METHOD))
|| (isset($option['ext']) && false === stripos($option['ext'], __EXT__)) // 伪静态后缀检测 || (isset($option['ext']) && false === stripos($option['ext'], __EXT__)) // 伪静态后缀检测
|| (isset($option['domain']) && !in_array($option['domain'], [$_SERVER['HTTP_HOST'], self::$subDomain])) // 域名检测 || (isset($option['domain']) && !in_array($option['domain'], [$_SERVER['HTTP_HOST'], self::$subDomain])) // 域名检测
|| (!empty($option['https']) && !self::isSsl()) // https检测 || (!empty($option['https']) && !self::isSsl()) // https检测
|| (!empty($option['before_behavior']) && false === Hook::exec($option['before_behavior'])) // 行为检测 || (!empty($option['before_behavior']) && false === Hook::exec($option['before_behavior'], $url)) // 行为检测
|| (!empty($option['callback']) && is_callable($option['callback']) && false === call_user_func($option['callback'])) // 自定义检测 || (!empty($option['callback']) && is_callable($option['callback']) && false === call_user_func($option['callback'])) // 自定义检测
) { ) {
return false; return false;

3
library/think/db/Driver.php
View File

@@ -260,7 +260,7 @@ abstract class Driver
// 判断占位符 // 判断占位符
$sql = is_numeric($key) ? $sql = is_numeric($key) ?
substr_replace($sql, $val, strpos($sql, '?'), 1) : substr_replace($sql, $val, strpos($sql, '?'), 1) :
str_replace(':' . $key, $val, $sql); str_replace(':' . $key, $this->parseValue($val), $sql);
} }
} }
return $sql; return $sql;
@@ -506,7 +506,6 @@ abstract class Driver
} else { } else {
$array[] = $this->parseKey($field); $array[] = $this->parseKey($field);
} }
} }
$fieldsStr = implode(',', $array); $fieldsStr = implode(',', $array);
} elseif (is_string($fields) && !empty($fields)) { } elseif (is_string($fields) && !empty($fields)) {