Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Revert "set the branch at login"

Browse source 
This reverts commit bf1fd83d08.

Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/auth.tmpl

Signed-off-by: Chris Cormack <crc@liblime.com>
This commit is contained in:
Joshua Ferraro 2007-08-09 10:44:52 -05:00 committed by Chris Cormack
parent b2420d8aa3
commit 663f3bb7d8
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
C4/Auth.pm
View file

@ -120,6 +120,7 @@ C4::Auth - Authenticates Koha users
sub get_template_and_user {
my $in = shift;
warn "GET Template";
my $template =
gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'} );
my ( $user, $cookie, $sessionID, $flags ) = checkauth(

1
koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
View file

@ -52,6 +52,7 @@
<ul>
<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li>
</ul>
<!-- /TMPL_IF -->
<script type="text/javascript">
// <![CDATA[

2
koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
View file

@ -80,7 +80,7 @@
<b> Login information</b>
</li>
<li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b>
at <b><!-- TMPL_VAR NAME="LoginBranchnameShort" --></b></li>
at <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
<!-- TMPL_IF NAME="AutoLocation" -->
<li>autolocate activated</li>
<!-- TMPL_ELSE -->