--- loncom/homework/structuretags.pm 2007/09/12 07:59:51 1.398 +++ loncom/homework/structuretags.pm 2007/09/12 08:35:44 1.399 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.398 2007/09/12 07:59:51 www Exp $ +# $Id: structuretags.pm,v 1.399 2007/09/12 08:35:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1149,29 +1149,31 @@ sub start_languageblock { # Now loop over all languages in order of preference foreach my $preferred_language (@preferred_languages) { # If the languageblock has no arguments, show the contents - $result='1'; + $result=1; + my $found=0; # Do we have an include argument? if ($include) { # If include is specified, by default, don't render the block - $result=''; + $result=0; foreach my $included_language (split(/\,/,$include)) { # ... but if my preferred language is included, render it if ($included_language eq $preferred_language) { - $result='1'; - last; + $result=1; + $found=1; } } } # Do we have an exclude argument? if ($exclude) { - $result='1'; + $result=1; foreach my $excluded_language (split(/\,/,$exclude)) { if ($excluded_language eq $preferred_language) { - $result='0'; - last; + $result=0; + $found=1; } } } + if ($found) { last; } } if ( ! $result ) { my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,