[Pkg-owncloud-commits] [owncloud] 05/20: Revert "Clarify the trusted_domain error page"

[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 dacacacc4fa2f807f3ee028eee80084618d2da26
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Sun Apr 27 18:33:50 2014 +0200

    Revert "Clarify the trusted_domain error page"
    
    This reverts commit 4f9a5c9d3c4debfc1816184d9923b9cca5a8be83.
---
 3rdparty     | 2 +-
 lib/base.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty b/3rdparty
index da3c9f6..b21547a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit da3c9f651a26cf076249ebf25c477e3791e69ca3
+Subproject commit b21547a83bc09ce1fb5e595f7c886e1c59c6d303
diff --git a/lib/base.php b/lib/base.php
index 5a83a69..b594aa4 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. 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.'
+				'Please contact your administrator'
 			);
 			return;
 		}

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