Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,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
Binary file modified updater.phar
Binary file not shown.
41 changes: 27 additions & 14 deletions vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*/
class ClassLoader
{
/** @var \Closure(string):void */
private static $includeFile;

/** @var ?string */
private $vendorDir;

Expand Down Expand Up @@ -106,6 +109,7 @@ class ClassLoader
public function __construct($vendorDir = null)
{
$this->vendorDir = $vendorDir;
self::initializeIncludeClosure();
}

/**
Expand Down Expand Up @@ -425,7 +429,8 @@ public function unregister()
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
includeFile($file);
$includeFile = self::$includeFile;
$includeFile($file);

return true;
}
Expand Down Expand Up @@ -555,18 +560,26 @@ private function findFileWithExtension($class, $ext)

return false;
}
}

/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*
* @param string $file
* @return void
* @private
*/
function includeFile($file)
{
include $file;
/**
* @return void
*/
private static function initializeIncludeClosure()
{
if (self::$includeFile !== null) {
return;
}

/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*
* @param string $file
* @return void
*/
self::$includeFile = \Closure::bind(static function($file) {
include $file;
}, null, null);
}
}
27 changes: 10 additions & 17 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,18 @@ public static function getLoader()
$loader->setClassMapAuthoritative(true);
$loader->register(true);

$includeFiles = \Composer\Autoload\ComposerStaticInitd7f5ddc48e4715174279359c16c76340::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired7f5ddc48e4715174279359c16c76340($fileIdentifier, $file);
$filesToLoad = \Composer\Autoload\ComposerStaticInitd7f5ddc48e4715174279359c16c76340::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

require $file;
}
}, null, null);
foreach ($filesToLoad as $fileIdentifier => $file) {
$requireFile($fileIdentifier, $file);
}

return $loader;
}
}

/**
* @param string $fileIdentifier
* @param string $file
* @return void
*/
function composerRequired7f5ddc48e4715174279359c16c76340($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

require $file;
}
}