Skip to content

Commit

Permalink
Merge branch '6.0' of https://github.com/top-think/framework into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
liu21st committed Oct 23, 2019
2 parents c7c9945 + 778fe7e commit a178147
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/think/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,6 @@ public function cookie(string $name = '', $default = null, $filter = '')

if (is_array($data)) {
array_walk_recursive($data, [$this, 'filterValue'], $filter);
reset($data);
} else {
$this->filterValue($data, $name, $filter);
}
Expand Down Expand Up @@ -1276,7 +1275,6 @@ protected function filterData($data, $filter, $name, $default)

if (is_array($data)) {
array_walk_recursive($data, [$this, 'filterValue'], $filter);
reset($data);
} else {
$this->filterValue($data, $name, $filter);
}
Expand Down

0 comments on commit a178147

Please sign in to comment.