Skip to content

Commit 31ae195

Browse files
authored
Merge pull request #6498 from iRedds/refactor/cache-name-generator
2 parents 475b788 + 4e671a8 commit 31ae195

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

system/CodeIgniter.php

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -729,18 +729,13 @@ protected function generateCacheName(Cache $config): string
729729
return md5($this->request->getPath());
730730
}
731731

732-
$uri = $this->request->getUri();
733-
if ($config->cacheQueryString) {
734-
if (is_array($config->cacheQueryString)) {
735-
$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(['only' => $config->cacheQueryString]));
736-
} else {
737-
$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery());
738-
}
739-
} else {
740-
$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
741-
}
732+
$uri = clone $this->request->getUri();
733+
734+
$query = $config->cacheQueryString
735+
? $uri->getQuery(is_array($config->cacheQueryString) ? ['only' => $config->cacheQueryString] : [])
736+
: '';
742737

743-
return md5($name);
738+
return md5($uri->setFragment('')->setQuery($query));
744739
}
745740

746741
/**

0 commit comments

Comments
 (0)