Skip to content

[stable13] Fix check if theming defaults instance is available - #8688

Merged
rullzer merged 1 commit into
stable13from
13-8557
Mar 6, 2018
Merged

[stable13] Fix check if theming defaults instance is available#8688
rullzer merged 1 commit into
stable13from
13-8557

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

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

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>
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Mar 6, 2018
@MorrisJobkeMorrisJobke added this to the Nextcloud 13.0.1 milestone Mar 6, 2018
@nickvergessennickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 6, 2018
@codecov

codecovBot commented Mar 6, 2018

Copy link
Copy Markdown

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 FilesCoverage ΔComplexity Δ
lib/private/URLGenerator.php73.91% <100%> (ø)56 <0> (?)

@rullzer
rullzer merged commit 56d5eb1 into stable13Mar 6, 2018
@rullzer
rullzer deleted the 13-8557 branch March 6, 2018 16:11
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@rullzer@nickvergessen