From b6612ef04acba99f6066482da933ece4b982dfd9 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 26 Apr 2014 23:11:29 +0200 Subject: [PATCH 1/3] Clarify the trusted_domain error page --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 0f55c1175c7..3a56a2f8b98 100644 --- a/lib/base.php +++ b/lib/base.php @@ -721,7 +721,7 @@ class OC { header('Status: 400 Bad Request'); OC_Template::printErrorPage( $l->t('You are accessing the server from an untrusted domain.'), - $l->t('Please contact your administrator') + $l->t('Please contact your administrator. If you are the administrator of this instance configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.') ); return; } From 7a8bfeae6e57685b76ad19fa1776e925f965e035 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 27 Apr 2014 16:31:04 +0200 Subject: [PATCH 2/3] Grammatical fixes --- lib/base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/base.php b/lib/base.php index 3a56a2f8b98..d425706e8ed 100644 --- a/lib/base.php +++ b/lib/base.php @@ -14,7 +14,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * + *t * You should have received a copy of the GNU Affero General Public * License along with this library. If not, see . * @@ -721,7 +721,7 @@ class OC { header('Status: 400 Bad Request'); OC_Template::printErrorPage( $l->t('You are accessing the server from an untrusted domain.'), - $l->t('Please contact your administrator. If you are the administrator of this instance configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.') + $l->t('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; } From 1d9ac38da67f31ebb6f4f7c68d92f42f427fe0bf Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 27 Apr 2014 16:41:09 +0200 Subject: [PATCH 3/3] Remove an added t by the github webeditor Notice to myself: Stick to my IDE. --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index d425706e8ed..37008b5a351 100644 --- a/lib/base.php +++ b/lib/base.php @@ -14,7 +14,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - *t + * * You should have received a copy of the GNU Affero General Public * License along with this library. If not, see . *