--- loncom/publisher/lonretrieve.pm 2011/12/23 17:21:18 1.48 +++ loncom/publisher/lonretrieve.pm 2012/12/05 16:57:29 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.48 2011/12/23 17:21:18 www Exp $ +# $Id: lonretrieve.pm,v 1.50 2012/12/05 16:57:29 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -99,7 +99,6 @@ use strict; use Apache::File; use File::Copy; use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; use Apache::loncommon(); use Apache::lonlocal; use Apache::lonnet; @@ -162,7 +161,7 @@ sub phaseone { || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { $r->print(''. &Apache::loncommon::modal_link( - '/adm/diff?filename=/priv/'.$udom,'/'.$uname.$fn. + '/adm/diff?filename=/priv/'.$udom.'/'.$uname.$fn. '&versiontwo=priv&versionone='.$version, &mt('Diffs with Version [_1]',$version),550,450). ''); @@ -304,7 +303,7 @@ sub handler { my $uname; my $udom; - ($uname,$udom) = &Apache::loncacc::constructaccess($fn); + ($uname,$udom) = &Apache::lonnet::constructaccess($fn); unless (($uname ne '') && ($udom ne '')) { $r->log_reason($uname.' at '.$udom. ' trying to publish file '.$env{'form.filename'}.