[Pkg-owncloud-commits] [owncloud] 11/21: trusted domains shall not be ignored on autosetup

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 267c0ff567c23601992d88e049acc09a8658d153
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Tue Jun 17 22:58:08 2014 +0200

    trusted domains shall not be ignored on autosetup
---
 lib/private/setup.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/private/setup.php b/lib/private/setup.php
index 8ef563b..ea58db9 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -50,6 +50,12 @@ class OC_Setup {
 		$username = htmlspecialchars_decode($options['adminlogin']);
 		$password = htmlspecialchars_decode($options['adminpass']);
 		$datadir = htmlspecialchars_decode($options['directory']);
+		if(    isset($options['trusted_domains'])
+		    && is_array($options['trusted_domains'])) {
+			$trustedDomains = $options['trusted_domains'];
+		} else {
+			$trustedDomains = array(OC_Request::serverHost());
+		}
 
 		if (OC_Util::runningOnWindows()) {
 			$datadir = rtrim(realpath($datadir), '\\');
@@ -65,7 +71,7 @@ class OC_Setup {
 		OC_Config::setValue('passwordsalt', $salt);
 
 		//write the config file
-		OC_Config::setValue('trusted_domains', array(OC_Request::serverHost())); 
+		OC_Config::setValue('trusted_domains', $trustedDomains);
 		OC_Config::setValue('datadirectory', $datadir);
 		OC_Config::setValue('dbtype', $dbtype);
 		OC_Config::setValue('version', implode('.', OC_Util::getVersion()));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git