[Pkg-owncloud-commits] [owncloud] 06/20: Clarify the trusted_domain error page Backport of https://github.com/owncloud/core/pull/8372

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 283a8b96246f8d291a3c0168f8720352fbe71b13
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Sun Apr 27 18:34:35 2014 +0200

    Clarify the trusted_domain error page
    Backport of https://github.com/owncloud/core/pull/8372
---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index b594aa4..5a83a69 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -721,7 +721,7 @@ class OC {
 			header('Status: 400 Bad Request');
 			OC_Template::printErrorPage(
 				'You are accessing the server from an untrusted domain.',
-				'Please contact your administrator'
+				'Please contact your administrator. If you are an administrator of this instance, configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.'
 			);
 			return;
 		}

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