upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #37872 from nextcloud/backport/37853/stable26

Browse source
This commit is contained in:
Julius Härtl 2023-05-15 21:26:22 +02:00 committed by GitHub
commit cbdc10a195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/base.php
View file

@ -68,7 +68,6 @@ declare(strict_types=1);
use OC\Encryption\HookManager;
use OC\EventDispatcher\SymfonyAdapter;
use OC\Files\Filesystem;
use OC\Share20\Hooks;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Group\Events\UserRemovedEvent;
@ -115,6 +114,8 @@ class OC {
public static string $configDir;
public static int $VERSION_MTIME = 0;
/**
* requested app
*/
@ -598,7 +599,8 @@ class OC {
// Add default composer PSR-4 autoloader
self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
self::$composerAutoloader->setApcuPrefix('composer_autoload');
OC::$VERSION_MTIME = filemtime(OC::$SERVERROOT . '/version.php');
self::$composerAutoloader->setApcuPrefix('composer_autoload_' . md5(OC::$SERVERROOT . '_' . OC::$VERSION_MTIME));
try {
self::initPaths();

4
lib/private/legacy/OC_Util.php
View file

@ -65,7 +65,6 @@
*/
use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppFramework\Http\Request;
use OC\Files\SetupManager;
use OCP\Files\Template\ITemplateManager;
use OCP\IConfig;
@ -327,10 +326,9 @@ class OC_Util {
return;
}
$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
require OC::$SERVERROOT . '/version.php';
/** @var int $timestamp */
self::$versionCache['OC_Version_Timestamp'] = $timestamp;
self::$versionCache['OC_Version_Timestamp'] = \OC::$VERSION_MTIME;
/** @var string $OC_Version */
self::$versionCache['OC_Version'] = $OC_Version;
/** @var string $OC_VersionString */