Make sure to not propagate a share event to a workspace parent if it'…

…s a template.
pydio · Jun 25, 2015 · baaf59f · baaf59f · mikerhyner · Jun 25, 2015
1 parent 894fdae
commit baaf59f
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -632,19 +632,22 @@ private function findMirrorNodesInShares($node, $direction){
         if($direction !== "DOWN"){
             if($node->getRepository()->hasParent()){
                 $parentRepoId = $node->getRepository()->getParentId();
-                $currentRoot = $node->getRepository()->getOption("PATH");
-                $owner = $node->getRepository()->getOwner();
-                $resolveUser = null;
-                if($owner != null){
-                    $resolveUser = ConfService::getConfStorageImpl()->createUserObject($owner);
-                }
-                $parentRoot = ConfService::getRepositoryById($parentRepoId)->getOption("PATH", false, $resolveUser);
-                $relative = substr($currentRoot, strlen($parentRoot));
-                $parentNodeURL = $node->getScheme()."://".$parentRepoId.$relative.$node->getPath();
-                $this->logDebug("action.share", "Should trigger on ".$parentNodeURL);
-                $parentNode = new AJXP_Node($parentNodeURL);
-                if($owner != null) $parentNode->setUser($owner);
-                $result[$parentRepoId] = array($parentNode, "UP");
+                $parentRepository = ConfService::getRepositoryById($parentRepoId);
+                if(!empty($parentRepository) && !$parentRepository->isTemplate){
+                    $currentRoot = $node->getRepository()->getOption("PATH");
+                    $owner = $node->getRepository()->getOwner();
+                    $resolveUser = null;
+                    if($owner != null){
+                        $resolveUser = ConfService::getConfStorageImpl()->createUserObject($owner);
+                    }
+                    $parentRoot = $parentRepository->getOption("PATH", false, $resolveUser);
+                    $relative = substr($currentRoot, strlen($parentRoot));
+                    $parentNodeURL = $node->getScheme()."://".$parentRepoId.$relative.$node->getPath();
+                    $this->logDebug("action.share", "Should trigger on ".$parentNodeURL);
+                    $parentNode = new AJXP_Node($parentNodeURL);
+                    if($owner != null) $parentNode->setUser($owner);
+                    $result[$parentRepoId] = array($parentNode, "UP");
+                }
             }
         }
         return $result;