Commit 3a549b18 authored by Clément OUDOT's avatar Clément OUDOT

Backport fixes for error redirection in 1.4 branch (#LEMONLDAP-958)

git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/branches/lemonldap-ng_version_1_4-bugfixes@4780 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 473efe40
......@@ -23,10 +23,10 @@
<div id="error">
<TMPL_IF URL>
<h3>
<div class="message message-warning alert">
<lang en="You were redirect from " fr="Vous avez été redirigé depuis " />
<a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="URL"></a>
</h3>
</div>
</TMPL_IF>
<div class="buttons">
......
......@@ -71,7 +71,7 @@ use Digest::MD5;
#inherits Apache::Session
#link Lemonldap::NG::Common::Apache::Session::SOAP protected globalStorage
our $VERSION = '1.4.6';
our $VERSION = '1.4.7';
use base qw(Lemonldap::NG::Common::CGI Exporter);
our @ISA;
......@@ -2566,7 +2566,8 @@ sub autoRedirect {
# Redirection should be made if
# - urldc defined
if ( $self->{urldc} ) {
# - lmError parameter is not defined
if ( $self->{urldc} and !$self->param("lmError") ) {
# Cross-domain mechanism
if ( $self->{cda}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment