mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash when a cached path doesn't actually exist in the specified datasource

Browse Source 
Fixes an issue when using databaseTemplates where if the pathCache had been generated, and then any template was removed from the database manually the pathCache being out of date would cause an exception to be thrown elsewhere.
This commit is contained in:
Luke Towers 2020-05-22 21:01:45 -06:00
parent 64f3327e67
commit 0c46209725
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/cms/classes/AutoDatasource.php
View File

@ -333,7 +333,24 @@ class AutoDatasource extends Datasource implements DatasourceInterface
public function selectOne(string $dirName, string $fileName, string $extension)
{
try {
$result = $this->getDatasourceForPath($this->makeFilePath($dirName, $fileName, $extension))->selectOne($dirName, $fileName, $extension);
$path = $this->makeFilePath($dirName, $fileName, $extension);
$result = $this->getDatasourceForPath($path)->selectOne($dirName, $fileName, $extension);
// if result = null, this means that
// - a: The requested record doesn't exist
// - b: The requested record exists, but is marked deleted
// - c: The requested record is reported to exist in a datasource that it doesn't actually exist in
if (is_null($result)) {
foreach ($this->pathCache as $paths) {
// If the path is reported to exist here (and isn't marked deleted) even though the previous attempt
// returned nothing, then the paths cache needs to be rebuilt and we should try again
if (@$paths[$path]) {
$this->populateCache(true);
$result = $this->getDatasourceForPath($path)->selectOne($dirName, $fileName, $extension);
break;
}
}
}
} catch (Exception $ex) {
$result = null;
}