--- rat/lonpage.pm	2016/05/30 03:02:37	1.114
+++ rat/lonpage.pm	2016/05/30 04:50:39	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.114 2016/05/30 03:02:37 raeburn Exp $
+# $Id: lonpage.pm,v 1.115 2016/05/30 04:50:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -498,32 +498,25 @@ ENDEXT
                                               my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
                                               if (@interval > 1) {
                                                   my $first_access;
-                                                  if ($first_access > 0) {
-                                                      if ($interval[1] eq 'map') {
-                                                          my $ignorecache;
-                                                          if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
-                                                              $ignorecache = 1;
-                                                          }
-                                                          $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache);
-                                                          if (($first_access) && (!$pagefirstaccess)) {
-                                                              $pagefirstaccess = $first_access;
-                                                          }
-                                                      } else {
-                                                          $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+                                                  if ($interval[1] eq 'map') {
+                                                      my $ignorecache;
+                                                      if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+                                                          $ignorecache = 1;
                                                       }
-                                                      if ($first_access > 0) {
-                                                          my ($timelimit) = ($interval[0] =~ /^(\d+)/);
-                                                          if ($timelimit) {
-                                                              my $timeremains = $timelimit + $first_access - $now;
-                                                              if ($timeremains > 0) {
-                                                                  $timerhastime = $timeremains;
-                                                              }
-                                                          }
+                                                      $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache);
+                                                      if (($first_access) && (!$pagefirstaccess)) {
+                                                          $pagefirstaccess = $first_access;
                                                       }
+                                                  } else {
+                                                      $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+                                                  }
+                                                  if ($first_access > 0) {
                                                       my ($timelimit) = ($interval[0] =~ /^(\d+)/);
-                                                      my $timeremains = $first_access+$timelimit - $now;
-                                                      if ($timeremains > 0) {
-                                                          $timerhastime = $timeremains;
+                                                      if ($timelimit) {
+                                                          my $timeremains = $timelimit + $first_access - $now;
+                                                          if ($timeremains > 0) {
+                                                              $timerhastime = $timeremains;
+                                                          }
                                                       }
                                                   }
                                               }