--- loncom/publisher/lonretrieve.pm	2006/09/19 21:47:29	1.32
+++ loncom/publisher/lonretrieve.pm	2006/12/06 22:22:39	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.32 2006/09/19 21:47:29 albertel Exp $
+# $Id: lonretrieve.pm,v 1.34 2006/12/06 22:22:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 # ------------------------------------ Interface for selecting previous version
 sub phaseone {
@@ -125,10 +126,14 @@ sub phaseone {
 	}
 	$r->print(&Apache::loncommon::end_data_table_row().
 		  &Apache::loncommon::end_data_table().
-		  '<p>'.
-		  '<span class="LC_error">'.
-		  &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span><p>'.
-		  '<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
+		  '<p>'.'<span class="LC_warning">'.
+		  &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>');
+	if (!$is_meta) {
+	    $r->print('<p>'.'<span class="LC_warning">'.
+		      &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.').
+		      '</span></p>');
+	}
+	$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
     } else {
 	$r->print('<h3>'.&mt('No previous versions published.').'</h3>');
     }
@@ -238,7 +243,7 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/\/\~(\w+)//;
+  $fn=~s{/~($LONCAPA::username_re)}{};
 
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;