--- loncom/interface/londocs.pm	2013/12/31 15:03:56	1.484.2.47
+++ loncom/interface/londocs.pm	2014/01/12 23:13:50	1.484.2.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.47 2013/12/31 15:03:56 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.49 2014/01/12 23:13:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1087,6 +1087,7 @@ sub update_paste_buffer {
     }
     &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});
+    return;
 }
 
 sub recurse_uploaded_maps {
@@ -1242,8 +1243,8 @@ sub print_paste_buffer {
                 '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
                 ('&nbsp;'x2);
         }
-        $form_end = = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
-                      '</form>';
+        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
+                    '</form>';
     } else {
         $pasteitems = &mt('Clipboard is empty');
     }
@@ -3354,6 +3355,7 @@ sub entryline {
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/\&#39\;/\\\'/g;
     $renametitle=~s/ /%20/g;
     my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end,$form_common,$form_param);