[LON-CAPA-cvs] cvs: loncom /interface londocs.pm portfolio.pm /publisher lonupload.pm

[raeburn]

raeburn		Mon Apr 16 19:32:05 2012 EDT

  Modified files:              
    /loncom/interface	londocs.pm portfolio.pm 
    /loncom/publisher	lonupload.pm 
  Log:
  - loncommon::modify_html_refs() now explicitly called in scalar context.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.481 loncom/interface/londocs.pm:1.482
--- loncom/interface/londocs.pm:1.481	Sun Apr  8 22:34:58 2012
+++ loncom/interface/londocs.pm	Mon Apr 16 19:31:57 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.481 2012/04/08 22:34:58 raeburn Exp $
+# $Id: londocs.pm,v 1.482 2012/04/16 19:31:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2432,10 +2432,11 @@
           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
           my ($destination,$dir_root) = &embedded_destination();
-          $r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
-                                                         $docuname,$docudom,undef,
-                                                         $dir_root).
-                   &return_to_editor());
+          my $result = 
+              &Apache::loncommon::modify_html_refs('coursedoc',$destination,
+                                                   $docuname,$docudom,undef,
+                                                   $dir_root);
+          $r->print($result.&return_to_editor());   
       } elsif ($env{'form.phase'} eq 'decompress_uploaded') {
           $uploadphase = 'decompress_phase_one';
           $r->print(&decompression_phase_one().
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.233 loncom/interface/portfolio.pm:1.234
--- loncom/interface/portfolio.pm:1.233	Mon Oct 17 12:41:30 2011
+++ loncom/interface/portfolio.pm	Mon Apr 16 19:31:57 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.233 2011/10/17 12:41:30 raeburn Exp $
+# $Id: portfolio.pm,v 1.234 2012/04/16 19:31:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2618,8 +2618,11 @@
         }
     } elsif ($env{'form.action'} eq 'modify_orightml') {
         if ($can_upload) {
-            $r->print(&Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,$portfolio_root,$group));
-            $r->print(&done('Return to directory',$url));
+            my $result = 
+                &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,
+                                                     $portfolio_root,$group);
+            $r->print($result.
+                      &done('Return to directory',$url));
         } else {
             &missing_priv($r,$url,'upload');
         }
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.59 loncom/publisher/lonupload.pm:1.60
--- loncom/publisher/lonupload.pm:1.59	Mon Nov 14 00:20:31 2011
+++ loncom/publisher/lonupload.pm	Mon Apr 16 19:32:04 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.59 2011/11/14 00:20:31 raeburn Exp $
+# $Id: lonupload.pm,v 1.60 2012/04/16 19:32:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -446,8 +446,9 @@
     my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     my $path = &File::Basename::dirname($fn);
     $path =~ s{^\Q$url_root\E}{};
-    $result .= &Apache::loncommon::modify_html_refs($mode,$path,
-                              $uname,$udom,$dir_root);
+    my $outcome = 
+        &Apache::loncommon::modify_html_refs($mode,$path,$uname,$udom,$dir_root);
+    $result .= $outcome;
     if ($mode ne 'imsimport' && $mode ne 'testbank') {
         $result .= '<br /><h3><a href="'.$fn.'">'.
                   &mt('View main file').'</a></h3>'.