diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-02 10:40:53 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-02 10:40:53 +0200 |
| commit | f37d519d0d8acdbb6343df324b65b53b8f8d345b (patch) | |
| tree | f1fb89b0e907ccebcd7001363ec095cc2e3663d7 /lib/private/legacy | |
| parent | 6b1422929dc76405e83621abb6d9f779a8e15986 (diff) | |
| parent | 13892417c45156f9546d70ac97882b5812e24f58 (diff) | |
| download | nextcloud-server-f37d519d0d8acdbb6343df324b65b53b8f8d345b.tar.gz nextcloud-server-f37d519d0d8acdbb6343df324b65b53b8f8d345b.zip | |
Merge pull request #24946 from owncloud/issue-24943-duplicate-downgrade-unsupported-message
Do not show the hint when it's the same as the message
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/template.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index ce3b3dba38d..5023e3a60c8 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -316,6 +316,11 @@ class OC_Template extends \OC\Template\Base { * @param string $hint An optional hint message - needs to be properly escaped */ public static function printErrorPage( $error_msg, $hint = '' ) { + if ($error_msg === $hint) { + // If the hint is the same as the message there is no need to display it twice. + $hint = ''; + } + try { $content = new \OC_Template( '', 'error', 'error', false ); $errors = array(array('error' => $error_msg, 'hint' => $hint)); |