--- loncom/publisher/publisher.html	2001/06/23 18:51:32	1.12
+++ loncom/publisher/publisher.html	2001/06/24 17:27:38	1.14
@@ -23,9 +23,10 @@ function getdfilename() {
 
 function getufilename() {
   document.upublisher.filename.value=parent.LONCAPAToBePublished.location.href;
-  if (document.upublisher.filename.value.indexOf('/adm/pubdir')==-1) {
-      document.upublisher.submit();
+  if (document.upublisher.filename.value.indexOf('/adm/pubdir')!=-1) {
+      document.upublisher.filename.value=document.dpublisher.filename.value;
   }
+  document.upublisher.submit();
 }
 
 function getrfilename() {
@@ -55,7 +56,10 @@ function getcpfilename() {
 }
 
 function getnewdirfilename() {
-  document.newdir.filename.value=parent.LONCAPAToBePublished.location.href;
+   document.newdir.filename.value=parent.LONCAPAToBePublished.location.href;
+   if (document.newdir.filename.value.indexOf('/adm/pubdir')!=-1) {
+       document.newdir.filename.value=document.dpublisher.filename.value;
+   }
    if ((document.newdir.filename.value.charAt(
         document.newdir.filename.value.length-1)!='/') &&
        (document.newdir.filename.value.indexOf('/adm/pubdir')==-1)) {