Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6da3f27

Browse files
committed
Revert previous change, we already had the display_upgrade_note action.
1 parent dbaf217 commit 6da3f27

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

core/src/plugins/action.updater/class.UpdateController.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,8 @@ public function switchAction($action, $httpVars, $fileVars)
8585

8686
case "get_upgrade_path":
8787

88-
if(isSet($httpVars["proxy_note"])){
89-
$latestNote = $_SESSION["pydio-upgrade-latest-note"];
90-
if(!empty($latestNote)){
91-
$html = file_get_contents($latestNote, null, AjaXplorerUpgrader::getContext());
92-
header("Content-type: text/html");
93-
echo $html;
94-
return;
95-
}
96-
}
9788
header("Content-type: application/json");
98-
$jsonString = AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
99-
$data = json_decode($jsonString, true);
100-
if(!empty($this->pluginConf["UPDATE_SITE_USER"]) && isSet($data["latest_note"]) && strpos($data["latest_note"], $this->pluginConf["UPDATE_SITE"]) === 0 && ConfService::$useSession){
101-
$_SESSION["pydio-upgrade-latest-note"] = $data["latest_note"];
102-
$data["latest_note"] = rtrim(AJXP_Utils::detectServerURL(true), "/")."/?get_action=get_upgrade_path&proxy_note=true&secure_token=".$httpVars["secure_token"];
103-
echo json_encode($data);
104-
}else{
105-
echo $jsonString;
106-
}
89+
print AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
10790

10891
break;
10992

0 commit comments

Comments
 (0)