From 64e2e4ca2177c0279293497562f5580460eaf65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 7 Feb 2023 14:42:09 +0100 Subject: [PATCH 1/2] Revert "disable upgrades to 26 on 32-bit" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d57a58e023433441662e6579ebf8b4ba4bfd0b4a. This reverts commit ddc200d82e88081ff8108640cc16067ff2982b9b. This reverts commit 163f36257476d0643f881522e5fc25e70a9e5e09. This reverts commit 9cc05410414b53c9b0bf20fcb3c2e7e23081befe. Signed-off-by: Côme Chilliet --- index.php | 6 +----- lib/Updater.php | 5 ----- updater.phar | Bin 790513 -> 790206 bytes 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/index.php b/index.php index 4c00611f..d15ae621 100644 --- a/index.php +++ b/index.php @@ -21,6 +21,7 @@ * */ + class UpdateException extends \Exception { protected $data; @@ -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 = '
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) . '")
Following file will be downloaded automatically: ' . $response['url'] . ''; diff --git a/lib/Updater.php b/lib/Updater.php index 82083750..59614b6c 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -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 = '
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) . '")
Following file will be downloaded automatically: ' . $response['url'] . ''; diff --git a/updater.phar b/updater.phar index 027d13f82700a9fcc49118dc7dbc290bd2f35dca..69e423cd6d73cdd7fcb7d8db3f8810129091e50b 100755 GIT binary patch delta 6067 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%0DLqxy3QbmXB9IAt#H!lS0}63qzNIorI# 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 From c23ee7755577eff59c91a1d8aebb9b945cdbbdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Wed, 8 Feb 2023 10:16:34 +0100 Subject: [PATCH 2/2] Removed empty lines in index.php added by the revert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- index.php | 1 - updater.phar | Bin 790206 -> 790206 bytes 2 files changed, 1 deletion(-) diff --git a/index.php b/index.php index d15ae621..0251c003 100644 --- a/index.php +++ b/index.php @@ -21,7 +21,6 @@ * */ - class UpdateException extends \Exception { protected $data; diff --git a/updater.phar b/updater.phar index 69e423cd6d73cdd7fcb7d8db3f8810129091e50b..002684e4d043d8817aa3876a9482ed2213b19e92 100755 GIT binary patch delta 1297 zcmY+EYfO_@7{}jU-rieUT6(9YywH|H+qYH$?+ha%qEpl{3r3O4+%)1X8ZU9vWtuob z+>SFN5%hzXMB`${1V4yCbUI{^?F-3>Mi;Y0%!XMqV-{oZ`5!;|;rZox|L62M&*hxn z?v`(N%cstnTFXnDx3rX%w#{v8{pM=={qN^>?|rjs#d<{_>rvDYrxa_63zc=mQ_6Y7 zQRM=nPPLF&rCLP%iu-p|q<^cPMM7F#LENh@Ctltv6I>r6mmklidd*yM?9!Q4dXi0icf zs)<7u9AnIalF8agyqSd*&DJJjyY)ljpmhV$V?&(XoTE0x31@>xvzHKm&fdgR+)gDQ z{OPR3)~M`kzS+u7zBY*`s5yPC#g1BT+E)@a4ph3zfy2AF|EB}##B!DrcjllQw{p-2 zjT2n$#E80`7|s(X%1XPi=W`c^cF%=?5-C06mTiRA{eC_+4d8utVc?M48nh(Y92A4HxPgUEcED;0Uz zc{~pljpbpyQmCGID72aQFocn&^Pzm5kIszerIBa x@lQ%;x6W#v-Q4e3WbFLSKioC*$E!<TCFr%fyrqBD z!xb}CjO7*{f5L}DG9T7Og!oKh?8NDdeL}SB{}=O4#(d%HTAqpo_$9rQr@!$_S8a^- z^KShd3i+qLl~`$5MBHXT4`T-O<1@}DeqqF&LE|jqTjOlvY!gn8nQ-%wsYPU7YGur; z9e>Gx^T>Snb3I>Uw$brc^E~2hGlo=V`4oypC>9K<)Cy&jbun?&nkU9>C}p#)i8yRS z8gmhpe9>pb%S9;BYVRO+**_*;wYL*}4#Zh6IO0H@Xfe2__#@&^#h;53zoeG8eSb>k z^EFOB#cJo>uPxF+8cshiIMK^x=Uk%Bg-%;tNPbfI_gyF_Q8JUbwgl7ou>^C_xxsmE ztf<$G<=k_lt*i%kc6qS0n;w*4@}h}$FO)N0L>m{r;zP!rK13K1zRxda?iVxni<$dT zNpk>k4hNwB6+r8WAWqi@ae5{AA@OZ+k!WW>dSERKp8q3 zEyH@{NE>l`WEt`A2v(XchjOSKlNl?=Z#^<5)*&w;UXiiJa0UGB73k|$1-1~V#0vyBbFh47po(V$MB8C;#uO7xI*j^{%{;$;G1}Y7_Y*e z&Z;!=xZusI8RY8{=(j0>3HJzpEFr3`#$F25ONrO2F%3rzUc;^$yoNVw@alzFy}DJC5?dx7-1$TI-_aM{?K9Mrd{)EUhIf`j$qoPj