fix(JSRecourceLocator): Add missing slash after server root#44408
fix(JSRecourceLocator): Add missing slash after server root#44408
Conversation
The `OC::$SERVERROOT` is always returned without a trailing slash, so we need to add a slash between server root and apps directory. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
|
/backport to stable28 |
|
Hi all, So maybe someone can explain when it will be fixed in nc 28. Thanks Thorsten |
What do you mean with daily builds? This is already merged in the stable28 branch and will be released with 28.0.5, see the PR on stable28: #44413 |
|
Thank you for your quick reply. The release procedure was not quite clear to me here. That's what I mean by daily builds: https://download.nextcloud.com/server/ Greetings Thorsten |
It is fixed in the daily builds, I checked nextcloud-28-daily-2024-04-07 and it is included. |
|
Maybe I cannot update from daily.... I changed in config.php to php ./updater/updater.phar Current version is 28.0.4. Update to Nextcloud daily available. (channel: "daily") Steps that will be executed: Continue update? [y/N] y Info: Pressing Ctrl-C will finish the currently running step and then stops the updater. [✔] Check for expected files Update of code successful. Should the "occ upgrade" command be executed? [Y/n] Keep maintenance mode active? [y/N] Maintenance mode is disabled .... Thanks Thorsten |
|
Oh I see the confusion. Technically your installation's code has been updated to the daily. You can verify by checking for a change in The daily builds of stable releases (maintenance releases) will never trigger the If you're curious, you can see the README for the Updater which has a bit more on the details associated with the Updater and the associated EDIT: I guess at some point we could start bumping the patch level for daily stable builds: Lines 29 to 33 in f89dabb This would only be important if we had a maintenance release with a db migration (which is highly unusual) and if we wanted to make sure it worked for the daily's too. |
|
Hi.
Now I understand. Thanks for your detailed information.
Thorsten
Am 08.04.24 um 23:12 schrieb Josh:
…
Oh I see the confusion.
Technically your installation's code has been updated to the daily.
You can verify by checking for a change in
|lib/private/Template/JSResourceLocator.php| in your environment.
Should match the one here in the PR
<https://github.com/nextcloud/server/pull/44408/files>.
The daily builds of stable releases (maintenance releases) will never
trigger the |needUpgrade()|
<https://github.com/nextcloud/server/blob/5ddba78dc9920b766d38082826bb04556e5982a7/lib/private/legacy/OC_Util.php#L1133>
version check used by |occ upgrade| if the starting point is the
latest trailing version (e.g. v28.0.4) because the version string
<https://github.com/nextcloud/server/blob/f89dabb828e782af51992633c9fd57b593a2d5cb/version.php#L33>
in the daily build isn't bumped. It'll always look like the same
version once deployed... Fortunately it's basically irrelevant - there
are rarely db migrations or required app upgrades for daily
/maintenance/ releases. Only the code update (the piece handled by the
|updater.phar| is important.
If you're curious, you can see the README for the Updater which has a
bit more on the details associated with the Updater and the associated
|occ upgrade| piece:
https://github.com/nextcloud/updater?tab=readme-ov-file#how-it-works
|
Summary
The
OC::$SERVERROOTis always returned without a trailing slash, so we need to add a slash between server root and apps directory.Checklist