Merge branch '2.3' into 2

silverstripe · Feb 14, 2020 · 8d756db · 8d756db
2 parents be488bd + 91f1b17
commit 8d756db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -33,6 +33,9 @@ before_script:
   # Extra $PATH
   - export PATH=/usr/lib/chromium-browser/:$PATH
 
+  # Travis build
+  - echo 'memory_limit=-1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
   # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini

diff --git a/src/Extensions/ShareDraftContentSiteTreeExtension.php b/src/Extensions/ShareDraftContentSiteTreeExtension.php
@@ -10,6 +10,7 @@
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\Security\RandomGenerator;
 use SilverStripe\ShareDraftContent\Models\ShareToken;
+use SilverStripe\Subsites\Model\Subsite;
 
 /**
  * @property SiteTree|ShareDraftContentSiteTreeExtension $owner
@@ -55,8 +56,14 @@ public function ShareTokenLink()
     {
         $shareToken = $this->getNewShareToken();
 
+        if (class_exists(Subsite::class) && $this->owner->SubsiteID) {
+            $link = $this->owner->Subsite()->domain();
+        } else {
+            $link = Director::absoluteBaseURL();
+        }
+
         return Controller::join_links(
-            Director::absoluteBaseURL(),
+            $link,
             'preview',
             $this->generateKey($shareToken->Token),
             $shareToken->Token