[LON-CAPA-cvs] cvs: loncom /interface slotrequest.pm

[raeburn]

raeburn		Fri Jan 23 21:34:47 2009 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm 
  Log:
  - Bug 5888.
  &check_for_conflict() can return undef.
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.85 loncom/interface/slotrequest.pm:1.86
--- loncom/interface/slotrequest.pm:1.85	Sun Dec 21 04:14:39 2008
+++ loncom/interface/slotrequest.pm	Fri Jan 23 21:34:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.85 2008/12/21 04:14:39 raeburn Exp $
+# $Id: slotrequest.pm,v 1.86 2009/01/23 21:34:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -756,7 +756,7 @@
 				       $consumed_uniqueperiods);
     if ($conflict =~ /^error: /) {
         return 0;
-    } else {
+    } elsif ($conflict ne '') {
 	if ($slots->{$conflict}{'starttime'} < time) {
 	    return 0;
 	}