Use return link everywhere

textdrive · May 7, 2011 · 6a72bb9 · 6a72bb9
1 parent b2e66ad
commit 6a72bb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/cpan/download.cgi b/cpan/download.cgi
@@ -88,7 +88,8 @@ elsif ($in{'source'} == 3) {
 			print "</ul>\n";
 			$i++;
 			}
-		&ui_print_footer("", $text{'index_return'});
+		&ui_print_footer($in{'return'},
+			         $in{'returndesc'} || $text{'index_return'});
 		exit;
 		}
 
@@ -357,12 +358,14 @@ print &ui_form_end([ [ undef, $text{'download_cont'} ],
 			( [ "need", $text{'download_need'} ] ) : ( )
 		   ]);
 
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($in{'return'},
+		 $in{'returndesc'} || $text{'index_return'});
 
 sub install_error
 {
 print "<br><b>$main::whatfailed : $_[0]</b> <p>\n";
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($in{'return'},
+		 $in{'returndesc'} || $text{'index_return'});
 exit;
 }
 
diff --git a/cpan/install.cgi b/cpan/install.cgi
@@ -88,12 +88,7 @@ sub clean_up
 {
 system("rm -rf $mod_dir") if ($mod_dir && -d $mod_dir);
 unlink(@pfile) if ($in{'need_unlink'} && (!$config{'save_partial'} || $_[0]));
-if ($in{'return'}) {
-	&ui_print_footer($in{'return'}, $in{'returndesc'});
-	}
-else {
-	&ui_print_footer("", $text{'index_return'});
-	}
+&ui_print_footer($in{'return'}, $in{'returndesc'} || $text{'index_return'});
 }
 
 # show_output(desc, dir, command)