--- loncom/interface/londocs.pm	2012/12/07 16:48:19	1.522
+++ loncom/interface/londocs.pm	2012/12/07 17:15:56	1.524
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.522 2012/12/07 16:48:19 raeburn Exp $
+# $Id: londocs.pm,v 1.524 2012/12/07 17:15:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2443,7 +2443,7 @@ $form_common.'
                                                             $forceedit,
                                                             undef,$symb,
                                                             &escape($env{'form.folderpath'}),
-                                                            $renametitle);
+                                                            $renametitle,'','',1);
                 if ($jscall) {
                     $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
@@ -3238,6 +3238,9 @@ sub handler {
     if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                           {'folderpath' => 'scalar'});
+        unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
+            undef($env{'form.folderpath'});
+        }
     }
    
 # If we are not allowed to make changes, all we can see are supplemental docs