Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable13] theming: handle not being in the serverroot #8554

Conversation

kyrofa
Copy link
Member

@kyrofa kyrofa commented Feb 26, 2018

This PR is a backport of #8463 for v13.

Currently, the theming app assumes it's in the serverroot. However, with Nextcloud's flexibility regarding configurable app paths, this is not a safe assumption to make. If it happens to be an incorrect assumption, the theming app fails to work.

Instead of relying on the serverroot, just use the path from the AppManager and utilize relative paths for assets from there.

Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.

Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.

Fix nextcloud#8462

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test restarted, let's wait for results.

@codecov
Copy link

codecov bot commented Feb 27, 2018

Codecov Report

Merging #8554 into stable13 will increase coverage by <.01%.
The diff coverage is 60%.

@@              Coverage Diff               @@
##             stable13    #8554      +/-   ##
==============================================
+ Coverage       51.22%   51.22%   +<.01%     
  Complexity      24991    24991              
==============================================
  Files            1608     1608              
  Lines           95117    95119       +2     
  Branches         1376     1376              
==============================================
+ Hits            48724    48726       +2     
  Misses          46393    46393
Impacted Files Coverage Δ Complexity Δ
apps/theming/lib/Controller/ThemingController.php 75.19% <60%> (-0.2%) 43 <0> (ø)
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️

@juliusknorr juliusknorr merged commit 282b79c into nextcloud:stable13 Feb 27, 2018
@kyrofa kyrofa deleted the backport_13/8462/theming_app_outside_root branch February 27, 2018 16:05
@MorrisJobke MorrisJobke mentioned this pull request Mar 9, 2018
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants