Can you please rebase this against master, and resend. It currently doesnt apply
Chris * Marcel de Rooy ([email protected]) wrote: > From: Galen Charlton <[email protected]> > > Alternative to Marcel de Rooy's patch of 4 November. The > rest of C4/Auth.pm uses strftime("%c", localtime) to format > the timestamp, and in general, > strftime('%c', localtime) ne scalar(localtime). > > Signed-off-by: Galen Charlton <gmcharlt at gmail.com> > Signed-off-by: Marcel de Rooy <[email protected]> > --- > C4/Auth.pm | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/C4/Auth.pm b/C4/Auth.pm > index c7477b1..7404f96 100644 > --- a/C4/Auth.pm > +++ b/C4/Auth.pm > @@ -717,7 +717,7 @@ sub checkauth { > ( $return, $cardnumber ) = checkpw( $dbh, $userid, > $password, $query ); > } > if ($return) { > - _session_log(sprintf "%20s from %16s logged in at %30s.\n", > $userid,$ENV{'REMOTE_ADDR'},localtime); > + _session_log(sprintf "%20s from %16s logged in at %30s.\n", > $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime)); > if ( $flags = haspermission( $userid, $flagsrequired ) ) { > $loggedin = 1; > } > -- > 1.6.0.6 > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand
signature.asc
Description: Digital signature
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
