diff --git a/Dockerfile b/Dockerfile index 945a018d9d0c45c40b68152553bf661c995f3715..1ae746354a1d531c9f8113c84699dd1b32476c9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="991454" ARG MEMORIES_VERSION="7.3.1" ARG DROP_ACCOUNT_VERSION="2.5.0" -RUN sed -i 's/28,0,9,1/28,0,9,5/' ${BASE_DIR}/version.php +RUN sed -i 's/28,0,9,1/28,0,9,6/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images diff --git a/patches/031-theme-custom-app-translations.patch b/patches/031-theme-custom-app-translations.patch index 56f1433c96c45faf0125323f8e9616040f0c6e04..8c161185c9c728ca7b2a778ae562c63c6a8eae11 100644 --- a/patches/031-theme-custom-app-translations.patch +++ b/patches/031-theme-custom-app-translations.patch @@ -1,13 +1,13 @@ --- ./lib/private/Template/JSResourceLocator.php 2024-08-29 22:10:30.588659044 +0530 +++ ./lib/private/Template/JSResourceLocator-new.php 2024-08-29 23:55:00.239753244 +0530 -@@ -62,6 +62,7 @@ - // Handle symlinks - $appRoot = realpath($appRoot); - } -+ $appDirName = basename($appRoot); - // Get the app webroot - $appWebRoot = dirname($this->appManager->getAppWebPath($app)); +@@ -67,6 +67,7 @@ } catch (AppPathNotFoundException $e) { + // ignore + } ++ $appDirName = basename($appRoot); + + if (str_contains($script, '/l10n/')) { + // For language files we try to load them all, so themes can overwrite @@ -77,7 +78,7 @@ $found += $this->appendScriptIfExist($this->serverroot, $script); $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);