diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-05-08 11:51:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 11:51:34 +0200 |
| commit | 69c5bcd804ca9ed148892b566308413cdea61c0e (patch) | |
| tree | 3c38ab2380caea28baa8d54f040782f9dc069e00 /lib | |
| parent | 4d7a96bc85b9a114daf9fb027a483daf26905b25 (diff) | |
| parent | f12cd19c340809a5194b3f52933390f9d8e24845 (diff) | |
| download | nextcloud-server-69c5bcd804ca9ed148892b566308413cdea61c0e.tar.gz nextcloud-server-69c5bcd804ca9ed148892b566308413cdea61c0e.zip | |
Merge pull request #4719 from nextcloud/error-page-theming
ensure theming app is loaded when showing an error page
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/template.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 9a919ff12f2..b4c69327438 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -292,6 +292,11 @@ class OC_Template extends \OC\Template\Base { * @param string $hint An optional hint message - needs to be properly escaped */ public static function printErrorPage( $error_msg, $hint = '' ) { + if (\OC_App::isEnabled('theming') && !\OC_App::isAppLoaded('theming')) { + \OC_App::loadApp('theming'); + } + + if ($error_msg === $hint) { // If the hint is the same as the message there is no need to display it twice. $hint = ''; |