From 6da3f27e0c3a0aae07089731564a015255de6bac Mon Sep 17 00:00:00 2001 From: cdujeu Date: Thu, 7 Jul 2016 10:41:23 +0200 Subject: [PATCH] Revert previous change, we already had the display_upgrade_note action. --- .../action.updater/class.UpdateController.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/core/src/plugins/action.updater/class.UpdateController.php b/core/src/plugins/action.updater/class.UpdateController.php index 387ad02450..d96192152f 100644 --- a/core/src/plugins/action.updater/class.UpdateController.php +++ b/core/src/plugins/action.updater/class.UpdateController.php @@ -85,25 +85,8 @@ public function switchAction($action, $httpVars, $fileVars) case "get_upgrade_path": - if(isSet($httpVars["proxy_note"])){ - $latestNote = $_SESSION["pydio-upgrade-latest-note"]; - if(!empty($latestNote)){ - $html = file_get_contents($latestNote, null, AjaXplorerUpgrader::getContext()); - header("Content-type: text/html"); - echo $html; - return; - } - } header("Content-type: application/json"); - $jsonString = AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]); - $data = json_decode($jsonString, true); - if(!empty($this->pluginConf["UPDATE_SITE_USER"]) && isSet($data["latest_note"]) && strpos($data["latest_note"], $this->pluginConf["UPDATE_SITE"]) === 0 && ConfService::$useSession){ - $_SESSION["pydio-upgrade-latest-note"] = $data["latest_note"]; - $data["latest_note"] = rtrim(AJXP_Utils::detectServerURL(true), "/")."/?get_action=get_upgrade_path&proxy_note=true&secure_token=".$httpVars["secure_token"]; - echo json_encode($data); - }else{ - echo $jsonString; - } + print AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]); break;