Fix minisite error when public url differs from default, by passing o…

…riginal data or trying to use the SERVER_URL parameter.
pydio · Mar 30, 2016 · 7446b98 · 7446b98
1 parent 045b95d
commit 7446b98
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1132,7 +1132,7 @@ public static function loadShareByHash($hash){
         $mess = ConfService::getMessages();
         if($shareCenter->getShareStore()->isShareExpired($hash, $data)){
             AuthService::disconnect();
-            self::loadMinisite(array(), $hash, $mess["share_center.165"]);
+            self::loadMinisite($data, $hash, $mess["share_center.165"]);
             return;
         }
         if(!empty($data) && is_array($data)){
@@ -1146,7 +1146,12 @@ public static function loadShareByHash($hash){
                 self::loadPubliclet($data);
             }
         }else{
-            self::loadMinisite(array(), $hash, $mess["share_center.166"]);
+            $setUrl = ConfService::getCoreConf("SERVER_URL");
+            $data = array();
+            if (!empty($setUrl)) {
+                $data["AJXP_APPLICATION_BASE"] = $setUrl;
+            }
+            self::loadMinisite($data, $hash, $mess["share_center.166"]);
         }
 
     }