[4.x] Fix some multisite issues

src/Data/HasOrigin.php

@@ -2,8 +2,13 @@
 
 namespace Statamic\Data;
 
+use Statamic\Facades\Blink;
+
 trait HasOrigin
 {
+ /**
+ * @var string
+ */
  protected $origin;
 
  public function keys()
@@ -55,17 +60,30 @@ public function origin($origin = null)
  {
  return $this->fluentlyGetOrSet('origin')
  ->getter(function ($origin) {
- if (is_string($origin)) {
- $this->origin = $origin = $this->getOriginByString($origin);
- }
+ return $origin
+ ? Blink::once($this->getOriginBlinkKey(), fn () => $this->getOriginByString($origin))
+ : null;
+ })
+ ->setter(function ($origin) {
+ Blink::forget($this->getOriginBlinkKey());
 
- return $origin;
+ return is_object($origin) ? $this->getOriginIdFromObject($origin) : $origin;
  })
  ->args(func_get_args());
  }
 
  abstract public function getOriginByString($origin);
 
+ protected function getOriginBlinkKey()
+ {
+ return 'origin-'.class_basename($this).'-'.$this->id();
+ }
+
+ protected function getOriginIdFromObject($origin)
+ {
+ return $origin->id();
+ }
+
  public function hasOrigin()
  {
  return $this->origin() !== null;

src/Entries/Entry.php

@@ -66,7 +66,6 @@ class Entry implements Contract, Augmentable, Responsable, Localization, Protect
  protected $blueprint;
  protected $date;
  protected $locale;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
  protected $template;
@@ -200,7 +199,7 @@ public function deleteDescendants()
  $entry->delete();
  });
 
- $this->localizations = null;
+Blink::forget('entry-descendants-'.$this->id());
 
  return true;
  }
@@ -327,8 +326,13 @@ public function save()
  if ($this->id()) {
  Blink::store('structure-uris')->forget($this->id());
  Blink::store('structure-entries')->forget($this->id());
+ Blink::forget($this->getOriginBlinkKey());
  }
 
+ $this->ancestors()->each(fn ($entry) => Blink::forget('entry-descendants-'.$entry->id()));
+
+ $this->directDescendants()->each->save();
+
  $this->taxonomize();
 
  optional(Collection::findByMount($this))->updateEntryUris();
@@ -646,16 +650,33 @@ public function in($locale)
  return $this->descendants()->get($locale);
  }
 
- public function descendants()
+ public function ancestors()
  {
- if (! $this->localizations) {
- $this->localizations = Facades\Entry::query()
+ $ancestors = collect();
+
+ $origin = $this->origin();
+
+ while ($origin) {
+ $ancestors->push($origin);
+ $origin = $origin->origin();
+ }
+
+ return $ancestors;
+ }
+
+ public function directDescendants()
+ {
+ return Blink::once('entry-descendants-'.$this->id(), function () {
+ return Facades\Entry::query()
  ->where('collection', $this->collectionHandle())
  ->where('origin', $this->id())->get()
  ->keyBy->locale();
- }
+ });
+ }
 
- $localizations = collect($this->localizations);
+ public function descendants()
+ {
+ $localizations = $this->directDescendants();
 
  foreach ($localizations as $loc) {
  $localizations = $localizations->merge($loc->descendants());
@@ -669,12 +690,11 @@ public function existsIn($locale)
  return $this->in($locale) !== null;
  }
 
+ /** @deprecated */
  public function addLocalization($entry)
  {
  $entry->origin($this);
 
- $this->localizations[$entry->locale()] = $entry;
-
  return $this;
  }
 

src/Globals/Variables.php

@@ -229,6 +229,16 @@ protected function getOriginByString($origin)
  return $this->globalSet()->in($origin);
  }
 
+ protected function getOriginIdFromObject($origin)
+ {
+ return $origin->locale();
+ }
+
+ protected function getOriginBlinkKey()
+ {
+ return 'origin-globals-'.$this->id().'-'.$this->locale();
+ }
+
  public function newAugmentedInstance(): Augmented
  {
  return new AugmentedVariables($this);

src/StaticCaching/DefaultInvalidator.php

@@ -61,7 +61,7 @@ protected function invalidateAssetUrls($asset)
 
  protected function invalidateEntryUrls($entry)
  {
- $entry->descendants()->push($entry)->each(function ($entry) {
+ $entry->descendants()->merge([$entry])->each(function ($entry) {
  if (! $entry->isRedirect() && $url = $entry->absoluteUrl()) {
  $this->cacher->invalidateUrl(...$this->splitUrlAndDomain($url));
  }