--- loncom/interface/londocs.pm	2009/02/10 14:23:18	1.339
+++ loncom/interface/londocs.pm	2009/02/12 15:45:38	1.341
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.339 2009/02/10 14:23:18 ehlerst Exp $
+# $Id: londocs.pm,v 1.341 2009/02/12 15:45:38 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1899,6 +1899,7 @@ END
     }
     
     my $orig_url = $url;
+    $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
@@ -2928,11 +2929,16 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
+#       $hadchanges=0;
+#	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+#       if ($error) {
+#           $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+#       }
+#       if ($hadchanges) {
+#	   &mark_hash_old();
+#       }
+#
+#       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -3150,10 +3156,16 @@ my $content='content';
 my $navigation='navigation';
 my $varcd = 'Main Course Documents';
 $r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash)); 
-my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+ $hadchanges=0;
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
+       if ($hadchanges) {
+           &mark_hash_old();
+       }
+
+       &changewarning($r,'');
 $r->print('</div>');
       }
        if ($env{'form.pagepath'}) {
@@ -3166,7 +3178,6 @@ $r->print('</div>');
           $active = 'style="display: block;"';
        }
        $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
-	&changewarning($r);
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';