Skip to content

Commit

Permalink
Revert "disable upgrades to 26 on 32-bit"
Browse files Browse the repository at this point in the history
This reverts commit d57a58e.
This reverts commit ddc200d.
This reverts commit 163f362.
This reverts commit 9cc0541.
  • Loading branch information
come-nc committed Feb 7, 2023
1 parent b607243 commit 8801b88
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
6 changes: 1 addition & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*
*/


class UpdateException extends \Exception {
protected $data;

Expand Down Expand Up @@ -166,11 +167,6 @@ public function checkForUpdate() {
$versionString = isset($response['versionstring']) ? $response['versionstring'] : '';

if ($version !== '' && $version !== $this->currentVersion) {
if (PHP_INT_SIZE < 8 && version_compare($version, '26.0.0.0', '>=')) {
$this->updateAvailable = false;
$updateText = '<br />You are running a 32-bit system. Nextcloud 26 supports 64-bit only, therefore an update cannot be offered. Please switch to a 64-bit system first.';
return $updateText;
}
$this->updateAvailable = true;
$releaseChannel = $this->getCurrentReleaseChannel();
$updateText = 'Update to ' . htmlentities($versionString) . ' available. (channel: "' . htmlentities($releaseChannel) . '")<br /><span class="light">Following file will be downloaded automatically:</span> <code class="light">' . $response['url'] . '</code>';
Expand Down
5 changes: 0 additions & 5 deletions lib/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,6 @@ public function checkForUpdate() {
$versionString = isset($response['versionstring']) ? $response['versionstring'] : '';

if ($version !== '' && $version !== $this->currentVersion) {
if (PHP_INT_SIZE < 8 && version_compare($version, '26.0.0.0', '>=')) {
$this->updateAvailable = false;
$updateText = '<br />You are running a 32-bit system. Nextcloud 26 supports 64-bit only, therefore an update cannot be offered. Please switch to a 64-bit system first.';
return $updateText;
}
$this->updateAvailable = true;
$releaseChannel = $this->getCurrentReleaseChannel();
$updateText = 'Update to ' . htmlentities($versionString) . ' available. (channel: "' . htmlentities($releaseChannel) . '")<br /><span class="light">Following file will be downloaded automatically:</span> <code class="light">' . $response['url'] . '</code>';
Expand Down

0 comments on commit 8801b88

Please sign in to comment.