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] Fix check if theming defaults instance is available #8688

Merged
merged 1 commit into from Mar 6, 2018

Conversation

Projects
None yet
3 participants
@MorrisJobke
Member

MorrisJobke commented Mar 6, 2018

The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Backport of #8557

Fix check if theming defaults instance is available
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@rullzer

rullzer approved these changes Mar 6, 2018

@codecov

This comment has been minimized.

codecov bot commented Mar 6, 2018

Codecov Report

❗️ No coverage uploaded for pull request base (stable13@5f8c773). Click here to learn what that means.
The diff coverage is 100%.

@@             Coverage Diff             @@
##             stable13    #8688   +/-   ##
===========================================
  Coverage            ?   51.28%           
  Complexity          ?    25034           
===========================================
  Files               ?     1609           
  Lines               ?    95275           
  Branches            ?     1376           
===========================================
  Hits                ?    48864           
  Misses              ?    46411           
  Partials            ?        0
Impacted Files Coverage Δ Complexity Δ
lib/private/URLGenerator.php 73.91% <100%> (ø) 56 <0> (?)

@rullzer rullzer merged commit 56d5eb1 into stable13 Mar 6, 2018

3 checks passed

codecov/patch No report found to compare against
Details
codecov/project No report found to compare against
Details
continuous-integration/drone/pr the build was successful
Details

@rullzer rullzer deleted the 13-8557 branch Mar 6, 2018

@MorrisJobke MorrisJobke referenced this pull request Mar 9, 2018

Merged

13.0.1 RC1 #8748

10 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment