Loading Dockerfile +1 −0 Original line number Diff line number Diff line Loading @@ -148,6 +148,7 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch Loading patches/031-theme-custom-app-translations.patch 0 → 100644 +19 −0 Original line number Diff line number Diff line --- JSResourceLocator.php 2024-08-29 22:10:30.588659044 +0530 +++ 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)); } catch (AppPathNotFoundException $e) { @@ -77,7 +78,7 @@ $found += $this->appendScriptIfExist($this->serverroot, $script); $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script); $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot); - $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script); + $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$appDirName.'/'.$script); if ($found) { return; Loading
Dockerfile +1 −0 Original line number Diff line number Diff line Loading @@ -148,6 +148,7 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch Loading
patches/031-theme-custom-app-translations.patch 0 → 100644 +19 −0 Original line number Diff line number Diff line --- JSResourceLocator.php 2024-08-29 22:10:30.588659044 +0530 +++ 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)); } catch (AppPathNotFoundException $e) { @@ -77,7 +78,7 @@ $found += $this->appendScriptIfExist($this->serverroot, $script); $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script); $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot); - $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script); + $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$appDirName.'/'.$script); if ($found) { return;