Merge branch 'release/1.1.4'

deviateltd · Mar 27, 2017 · 568eeb6 · 568eeb6
2 parents 074bf4c + 3a6fe1f
commit 568eeb6
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/code/admin/SecuredAssetAdmin.php b/code/admin/SecuredAssetAdmin.php
@@ -149,8 +149,6 @@ public function currentPageID()
             return $this->request->requestVar('ID');
         } elseif (is_numeric($this->urlParams['ID'])) {
             return $this->urlParams['ID'];
-        } elseif (Session::get("{$this->class}.currentPage")) {
-            return Session::get("{$this->class}.currentPage");
         } else {
             $securedRoot = FileSecured::getSecuredRoot();
             if ($securedRoot && $securedRoot->exists()) {
@@ -200,7 +198,14 @@ public function getEditForm($id = null, $fields = null)
             $form->Fields()->removeByName("DetailsView");
             $config->removeComponentsByType("GridFieldLevelup");
         } else {
-            $config->getComponentByType("GridFieldLevelup")->setLinkSpec('admin/' . self::$url_segment . '/show/%d');
+            $link = 'admin/' . self::$url_segment . '/show/%d';
+            if(class_exists('Subsite')) {
+                $subsiteID = (int)Subsite::currentSubsiteID();
+                if ($subsiteID) {
+                    $link .= '?SubsiteID='.$subsiteID;
+                }
+            }
+            $config->getComponentByType("GridFieldLevelup")->setLinkSpec($link);
         }
 
         $gridField->setTitle(_t("SECUREDASSETADMIN.SecuriedFiles", "Advanced Assets"));
@@ -275,6 +280,20 @@ public function Breadcrumbs($unlinked = false)
         }
         if (isset($items[0]->Title)) {
             $items[0]->Title = _t("SECUREDASSETADMIN.SecuriedFiles", SECURED_FILES_MODULE_NAME);
+
+            if (isset($items[0]->Title)) {
+                $items[0]->Title = _t("SECUREDASSETADMIN.SecuriedFiles", SECURED_FILES_MODULE_NAME);
+                if(class_exists('Subsite')) {
+                    $subsiteID = (int) Subsite::currentSubsiteID();
+                    if($subsiteID) {
+                        if(parse_url($items[0]->Link, PHP_URL_QUERY)) {
+                            $items[0]->Link .= '&SubsiteID='.$subsiteID;
+                        } else {
+                            $items[0]->Link .= '?SubsiteID='.$subsiteID;
+                        }
+                    }
+                }
+            }
         }
 
         return $items;