diff --git a/src/flextype/Foundation/Entries/Entries.php b/src/flextype/Foundation/Entries/Entries.php index 88a3af4a..3c77c14f 100755 --- a/src/flextype/Foundation/Entries/Entries.php +++ b/src/flextype/Foundation/Entries/Entries.php @@ -150,18 +150,18 @@ class Entries $cache = flextype('entries')->storage['fetch']['data']['cache']['enabled'] ?? flextype('registry')->get('flextype.settings.cache.enabled'); - // Run event: onEntriesFetchSingleHasResult - flextype('emitter')->emit('onEntriesFetchSingleHasResult'); - - // Save entry data to cache - if ($cache) { - flextype('cache')->set($entryCacheID, $this->storage['fetch']['data']); - } - // Apply filter for fetch data $this->storage['fetch']['data'] = filter($this->storage['fetch']['data'], $this->storage['fetch']['options']); + // Run event: onEntriesFetchSingleHasResult + flextype('emitter')->emit('onEntriesFetchSingleHasResult'); + + // Save entry data to cache + if ($cache) { + flextype('cache')->set($entryCacheID, $this->storage['fetch']['data']); + } + // Return entry data return arrays($this->storage['fetch']['data']); }