--- loncom/publisher/lonpubdir.pm 2011/10/25 22:04:20 1.132 +++ loncom/publisher/lonpubdir.pm 2011/10/26 17:31:40 1.133 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.132 2011/10/25 22:04:20 www Exp $ +# $Id: lonpubdir.pm,v 1.133 2011/10/26 17:31:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -448,13 +448,12 @@ sub putdirectory { my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_; # construct the display filename: the directory name unless ..: - + + my $actionitem; + my $disfilename = $dirname; - if ($dirname eq '..') { - $disfilename = ''.&mt('Parent Directory').''; - } # Don't display directory itself, and there is no way up from root directory - unless ( (($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { + unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { my $kaputt=0; foreach (keys %{$bombs}) { if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; } @@ -467,10 +466,9 @@ sub putdirectory { &Apache::lonpublisher::metaeval( &Apache::lonnet::getfile($r->dir_config('lonDocRoot').$here.'/'.$dirname.'/default.meta') ); -# - my $actionitem = ''; - if ($here eq '..') { + if ($dirname eq '..') { $actionitem = &mt('Go to ...'); + $disfilename = ''.&mt('Parent Directory').''; } else { $actionitem = '