Make sure to transfer an empty DATA_TEMPLATE value to child repository - Fix #1152

Fix broken unsharing.

Author: cdujeu

core/src/plugins/access.fs/class.fsAccessDriver.php

@@ -2040,7 +2040,9 @@ public function makeSharedRepositoryOptions($httpVars, $repository)
             "PATH" => SystemTextEncoding::toStorageEncoding($repository->getOption("PATH")).AJXP_Utils::decodeSecureMagic($httpVars["file"]),
             "CREATE" => $repository->getOption("CREATE"),
             "RECYCLE_BIN" => isSet($httpVars["inherit_recycle"])? $repository->getOption("RECYCLE_BIN") : "",
-            "DEFAULT_RIGHTS" => "");
+            "DEFAULT_RIGHTS" => "",
+            "DATA_TEMPLATE" => ""
+        );
         if ($repository->getOption("USE_SESSION_CREDENTIALS")===true) {
             $newOptions["ENCODED_CREDENTIALS"] = AJXP_Safe::getEncodedCredentialString();
         }

core/src/plugins/action.share/class.ShareCenter.php

@@ -709,7 +709,7 @@ public function switchAction($action, $httpVars, $fileVars)
                         foreach($shares as $shareId =>  $share){
                             $t = isSet($share["type"]) ? $share["type"] : "file";
                             try{
-                                $result = $this->getShareStore()->deleteShare($t, $shareId);
+                                $result = $this->getShareStore()->deleteShare($t, $shareId, false, true);
                             }catch(Exception $e){
                                 if($e->getMessage() == "repo-not-found"){
                                     $result = true;
@@ -941,7 +941,7 @@ public function updateNodeSharedData($oldNode=null, $newNode=null, $copy = false
     public function cleanUserShares($userId){
         $shares = $this->getShareStore()->listShares($userId);
         foreach($shares as $hash => $data){
-            $this->getShareStore()->deleteShare($data['SHARE_TYPE'], $hash);
+            $this->getShareStore()->deleteShare($data['SHARE_TYPE'], $hash, false, true);
         }
     }