diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-19 12:20:10 +0300 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-19 12:20:10 +0300 |
commit | b864fb4cc86f4220c8c4b3c14f5a411456f37e73 (patch) | |
tree | 74e52e2bf1de1de0e532581c58dc52cb3af6368d | |
parent | 24911a36f7f5b25eb3073c2169ec31ffd1d7412d (diff) | |
parent | e9e1b0638c75a68010b92d92489837b790282707 (diff) |
Merge pull request #14150 from owncloud/no-whitespace-from-themes-stable6
catch any whitespaces which might get written to the output buffer while...
-rw-r--r-- | lib/private/defaults.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/defaults.php b/lib/private/defaults.php index a087e437069..77110adf511 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -1,9 +1,5 @@ <?php -if (file_exists(OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php')) { - require_once 'themes/' . OC_Util::getTheme() . '/defaults.php'; -} - /** * Default strings and values which differ between the enterprise and the * community edition. Use the get methods to always get the right strings. @@ -36,7 +32,11 @@ class OC_Defaults { $this->defaultLogoClaim = ""; $this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */ - if (class_exists("OC_Theme")) { + if (file_exists(OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php')) { + // prevent defaults.php from printing output + ob_start(); + require_once 'themes/' . OC_Util::getTheme() . '/defaults.php'; + ob_end_clean(); $this->theme = new OC_Theme(); } } |