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 bug where updating records that didn't exist in the DB yet would cause both the original and new records to display

Browse Source
This commit is contained in:
Luke Towers 2018-11-22 12:04:41 -06:00
parent 38fe4af1e6
commit 1920d5b4b6
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,8 @@ use October\Rain\Halcyon\Datasource\DatasourceInterface;
/**
* Datasource that loads from other data sources automatically
*
* @Todo: Need to prevent softdeleted DB records from appearing, even if they exist in the filesystem
* @package october\cms
* @author Luke Towers
*/
class AutoDatasource extends Datasource implements DatasourceInterface
{
@ -24,6 +25,11 @@ class AutoDatasource extends Datasource implements DatasourceInterface
*/
protected $pathCache = [];
/**
* @var boolean Flag on whether the cache should respect refresh requests
*/
protected $allowCacheRefreshes = true;
/**
* Create a new datasource instance.
*
@ -50,7 +56,7 @@ class AutoDatasource extends Datasource implements DatasourceInterface
$pathCache = [];
foreach ($this->datasources as $datasource) {
// Remove any existing cache data
if ($refresh) {
if ($refresh && $this->allowCacheRefreshes) {
Cache::forget($datasource->getPathsCacheKey());
}
@ -134,7 +140,7 @@ class AutoDatasource extends Datasource implements DatasourceInterface
$fnMatch = !empty($options['fileMatch']) ? fnmatch($options['fileMatch'], str_after($path, $basePath)) : true;
// Check the extension if provided as an option
$validExt = is_array($options['extensions']) && !empty($options['extensions']) ? in_array(pathinfo($path, PATHINFO_EXTENSION), $options['extensions']) : true;
$validExt = !empty($options['extensions']) && is_array($options['extensions']) ? in_array(pathinfo($path, PATHINFO_EXTENSION), $options['extensions']) : true;
return $inPath && $fnMatch && $validExt;
}, ARRAY_FILTER_USE_KEY));
@ -267,6 +273,14 @@ class AutoDatasource extends Datasource implements DatasourceInterface
$searchFileName = $oldFileName ?: $fileName;
$searchExt = $oldExtension ?: $extension;
// Ensure that files that are being renamed have their old names marked as deleted prior to inserting the renamed file
// Also ensure that the cache only gets updated at the end of this operation instead of twice, once here and again at the end
if ($searchFileName !== $fileName || $searchExt !== $extension) {
$this->allowCacheRefreshes = false;
$this->delete($dirName, $searchFileName, $searchExt);
$this->allowCacheRefreshes = true;
}
if (!empty($this->datasources[0]->selectOne($dirName, $searchFileName, $searchExt))) {
$result = $this->datasources[0]->update($dirName, $fileName, $extension, $content, $oldFileName, $oldExtension);
} else {