Skip to content

[6.x] Fix Cached Pages count for multi-site setups #14726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshuablum wants to merge 3 commits into
base: 6.x
Choose a base branch
from
Open

[6.x] Fix Cached Pages count for multi-site setups #14726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce2e04
Show a global cached pages count across all sites
joshuablum May 25, 2026
fdf98cf
Update label
joshuablum May 25, 2026
bbc7dfe
Update lang file key
joshuablum May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lang/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"Cache": "Cache",
"Cache Manager": "Cache-Verwaltung",
"Cached images": "Zwischengespeicherte Bilder",
"Cached Pages": "Zwischengespeicherte Seiten",
"Cached Pages (global)": "Zwischengespeicherte Seiten",
"caching": "Caching",
"Cancel": "Abbrechen",
"Cancel cropping": "Zuschneiden abbrechen",
Expand Down
2 changes: 1 addition & 1 deletion lang/de_CH.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"Cache": "Cache",
"Cache Manager": "Cache-Verwaltung",
"Cached images": "Zwischengespeicherte Bilder",
"Cached Pages": "Zwischengespeicherte Seiten",
"Cached Pages (global)": "Zwischengespeicherte Seiten",
"caching": "Caching",
"Cancel": "Abbrechen",
"Cancel cropping": "Zuschneiden abbrechen",
Expand Down
2 changes: 1 addition & 1 deletion lang/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"Cache": "Cache",
"Cache Manager": "Gestionnaire de cache",
"Cached images": "Images en cache",
"Cached Pages": "Pages en cache",
"Cached Pages (global)": "Pages en cache",
"caching": "mise en cache",
"Cancel": "Annuler",
"Cancel cropping": "Annuler le recadrage",
Expand Down
2 changes: 1 addition & 1 deletion lang/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"Cache": "Cache",
"Cache Manager": "Cache-manager",
"Cached images": "Afbeeldingen in cache",
"Cached Pages": "Paginas in cache",
"Cached Pages (global)": "Paginas in cache",
"caching": "caching",
"Cancel": "Annuleren",
"Cancel cropping": "Bijsnijden annuleren",
Expand Down
2 changes: 1 addition & 1 deletion lang/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"Cache": "Кэш",
"Cache Manager": "Управление кэшем",
"Cached images": "Кэшированные изображения",
"Cached Pages": "Кэшированные страницы",
"Cached Pages (global)": "Кэшированные страницы",
"caching": "кэшируется",
"Cancel": "Отменить",
"Cast Booleans": "Преобразовать в логические",
Expand Down
2 changes: 1 addition & 1 deletion resources/js/pages/utilities/Cache.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function invalidateStaticUrls() {
<Description>{{ __('statamic::messages.cache_utility_static_cache_description') }}</Description>
<div class="flex flex-wrap gap-2 mt-3">
<Badge :prepend="__('Strategy')">{{ static.strategy }}</Badge>
<Badge v-if="static.enabled" :prepend="__('Cached Pages')">{{ static.count }}</Badge>
<Badge v-if="static.enabled" :prepend="__('Cached Pages (global)')">{{ static.count }}</Badge>
</div>
</Card>
</Panel>
Expand Down
8 changes: 7 additions & 1 deletion src/Http/Controllers/CP/Utilities/CacheController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Statamic\Facades\URL;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\StaticCaching\Cacher;
use Statamic\StaticCaching\Cachers\AbstractCacher;
use Statamic\Support\Str;

use function Statamic\trans as __;
Expand Down Expand Up @@ -75,11 +76,16 @@ protected function getImageCacheStats()
protected function getStaticCacheStats()
{
$strategy = config('statamic.static_caching.strategy');
$cacher = StaticCache::driver();

$count = $cacher instanceof AbstractCacher
? $cacher->getDomains()->sum(fn ($domain) => $cacher->getUrls($domain)->count())
: $cacher->getUrls()->count();

return [
'enabled' => (bool) $strategy,
'strategy' => $strategy ?? __('Disabled'),
'count' => StaticCache::driver()->getUrls()->count(),
'count' => $count,
];
}

Expand Down
Loading