[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonhtmlcommon.pm

[raeburn]

raeburn		Fri Mar 19 22:34:23 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Backport 1.266, 1.269.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.182.4.12 loncom/interface/lonhtmlcommon.pm:1.182.4.13
--- loncom/interface/lonhtmlcommon.pm:1.182.4.12	Mon Feb 15 17:02:47 2010
+++ loncom/interface/lonhtmlcommon.pm	Fri Mar 19 22:34:23 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.182.4.12 2010/02/15 17:02:47 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.182.4.13 2010/03/19 22:34:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1068,7 +1068,7 @@
     # 
     my $str;
     if ($min == 0 && $sec > 1) {
-        $str = '[_2] seconds';
+        $str = '[_1] seconds';
     } elsif ($min == 1 && $sec > 1) {
         $str = '1 minute [_2] seconds';
     } elsif ($min == 1 && $sec < 2) {
@@ -1389,8 +1389,9 @@
         if ($menulink) {
             my $description = 'Menu';
             my $no_mt_descr = 0;
-            if (exists($env{'request.course.id'}) && 
-                $env{'request.course.id'} ne '') {
+            if ((exists($env{'request.course.id'})) &&
+                ($env{'request.course.id'} ne '') &&
+                ($env{'course.'.$env{'request.course.id'}.'.description'} ne '')) {
                 $description = 
                     $env{'course.'.$env{'request.course.id'}.'.description'};
                 $no_mt_descr = 1;