--- rat/lonpage.pm	2016/10/29 05:29:39	1.119
+++ rat/lonpage.pm	2017/02/20 18:29:33	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.119 2016/10/29 05:29:39 raeburn Exp $
+# $Id: lonpage.pm,v 1.121 2017/02/20 18:29:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -301,6 +301,7 @@ sub handler {
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
+                          my $plainsrc = $src;
                           my ($extension)=($src=~/\.(\w+)$/);
 			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
@@ -474,11 +475,11 @@ ENDEXT
                                   $output=~
                                       s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
                                   unless ($hastimer) {
-                                      if ($src =~ /$LONCAPA::assess_re/) {
+                                      if ($plainsrc =~ /$LONCAPA::assess_re/) {
                                           %Apache::lonhomework::history =
                                               &Apache::lonnet::restore($symb,$courseid,$domain,$name);
                                           my $type = 'problem';
-                                          if ($src =~ /\.task$/) {
+                                          if ($extension eq 'task') {
                                               $type = 'Task';
                                           }
                                           my ($status,$accessmsg,$slot_name,$slot) =
@@ -950,9 +951,11 @@ sub get_buttons {
         my ($cfile,$home,$switchserver,$forceedit,$forceview) =
             &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
         if ($cfile ne '') {
+            my $hostname = $r->hostname();
             my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
                                                                  $forceedit,1,$symb,undef,
-                                                                 &escape($env{'form.title'}));
+                                                                 &escape($env{'form.title'}),
+                                                                 $hostname);
             if ($jscall) {
                 my $icon = 'pcstr.png';
                 my $label = &mt('Edit');