catch any whitespaces which might get written to the output buffer while loading...

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 7993d17f3d1f339b887c959240f91198408c38d8..3123d178a5bd3b5839922a6efc0a45a2307c74ef 100644 (file)
--- 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.
@@ -43,7 +39,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();
                }
        }

diff --git a/lib/private/util.php b/lib/private/util.php
index 2642a71684f4bdc0d9f1e8ab08ef0a1a4bfd9a51..f02a990aa46fb4c13bf8dae7732f7142ba7ee51e 100644 (file)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -426,11 +426,6 @@ class OC_Util {
                        $webServerRestart = true;
                }
 
-               //common hint for all file permissions error messages
-               $permissionsHint = $l->t('Permissions can usually be fixed by '
-                       .'%sgiving the webserver write access to the root directory%s.',
-                       array('<a href="'.\OC_Helper::linkToDocs('admin-dir_permissions').'" target="_blank">', '</a>'));
-
                // Check if config folder is writable.
                if(!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
                        $errors[] = array(
@@ -470,6 +465,11 @@ class OC_Util {
                                        );
                                }
                        } else if (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
+                               //common hint for all file permissions error messages
+                               $permissionsHint = $l->t('Permissions can usually be fixed by '
+                                       .'%sgiving the webserver write access to the root directory%s.',
+                                       array('<a href="'.\OC_Helper::linkToDocs('admin-dir_permissions').'" target="_blank">', '</a>'));
+
                                $errors[] = array(
                                        'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable by ownCloud',
                                        'hint' => $permissionsHint