From ca1b0db0d29ab32c751d0ba4bcdf605da0cbde0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Fri, 19 Apr 2013 08:27:29 +0000
Subject: [PATCH] Fix getDisplayType call in Multi backend (#593)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthMulti.pm | 7 ++-----
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Multi.pm    | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthMulti.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthMulti.pm
index a3bc4b96c..e0127c390 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthMulti.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthMulti.pm
@@ -7,7 +7,7 @@ package Lemonldap::NG::Portal::AuthMulti;
 
 use Lemonldap::NG::Portal::_Multi;    #inherits
 
-our $VERSION = '1.2.2';
+our $VERSION = '1.2.4';
 
 sub authInit {
     my $self = shift;
@@ -46,10 +46,7 @@ sub authForce {
 
 sub getDisplayType {
     my $self = shift;
-    my $s =
-        "Lemonldap::NG::Portal::Auth"
-      . $self->{_multi}->{last}->[0]
-      . "::getDisplayType";
+    my $s    = $self->{_multi}->{last}->[0] . "::getDisplayType";
     return &{$s};
 }
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Multi.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Multi.pm
index 070bcfa1a..5f2304848 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Multi.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Multi.pm
@@ -12,7 +12,7 @@ package Lemonldap::NG::Portal::_Multi;
 
 use Lemonldap::NG::Portal::Simple;
 
-our $VERSION = '1.2.2';
+our $VERSION = '1.2.4';
 
 ## @cmethod Lemonldap::NG::Portal::_Multi new(Lemonldap::NG::Portal::Simple portal)
 # Constructor
@@ -69,7 +69,7 @@ sub try {
     my $ci;
 
     # Store last module used
-    $self->{last}->[$type] = $old;
+    $self->{last}->[$type] = $self->{stack}->[$type]->[0]->{m};
 
     if ( $ci = $self->{p}->safe->reval( $self->{stack}->[$type]->[0]->{c} ) ) {