Revert "Merge pull request #5923 from NodeBB/patch-5922"

This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
v1.18.x
Julian Lam 7 years ago
parent 3c335cb451
commit 38a7030639

@ -5,7 +5,6 @@
"not-logged-in": "You don't seem to be logged in.",
"account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account - please login or register.",
"goback": "Return to the previous page",
"invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID",

@ -26,7 +26,7 @@ helpers.noScriptErrors = function (req, res, error, httpStatus) {
path: req.path,
loggedIn: true,
error: error,
returnLink: req.get('Referrer'),
returnLink: true,
title: '[[global:' + httpStatusString + '.title]]',
});
});

@ -7,6 +7,6 @@
<!-- ENDIF error -->
<!-- IF returnLink -->
<a href="{returnLink}">[[error:goback]]</a>
<p>[[error:goback]]</p>
<!-- ENDIF returnLink -->
</div>

@ -7,7 +7,7 @@
<!-- ENDIF error -->
<!-- IF returnLink -->
<a href="{returnLink}">[[error:goback]]</a>
<p>[[error:goback]]</p>
<!-- ENDIF returnLink -->
<!-- IF !loggedIn -->

@ -4,7 +4,7 @@ define('/assets/templates/500.jst', function () {
return '<div class="alert alert-danger">\n\t<strong>[[global:500.title]]</strong>\n\t<p>[[global:500.message]]</p>\n\t<p>' +
helpers.__escape(get(context && context['path'])) + '</p>\n\t' +
(get(context && context['error']) ? '<p>' + helpers.__escape(get(context && context['error'])) + '</p>' : '') + '\n\n\t' +
(get(context && context['returnLink']) ? '\n\t<a href="' + (get(context && context['returnLink'])) + '">[[error:goback]]</a>\n\t' : '') + '\n</div>\n';
(get(context && context['returnLink']) ? '\n\t<p>[[error:goback]]</p>\n\t' : '') + '\n</div>\n';
}
return compiled;

@ -5,6 +5,6 @@
<!-- IF error --><p>{error}</p><!-- ENDIF error -->
<!-- IF returnLink -->
<a href="{returnLink}">[[error:goback]]</a>
<p>[[error:goback]]</p>
<!-- ENDIF returnLink -->
</div>

Loading…
Cancel
Save