kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'gb/gitweb-opml' 

* gb/gitweb-opml:
  gitweb: suggest name for OPML view
  gitweb: don't use pathinfo for global actions
maint
Junio C Hamano 2009-01-17 23:07:19 -08:00
parent 8f31355692 ae35785e3a
commit 094f75b433
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gitweb/gitweb.perl
View File

@ -834,7 +834,7 @@ sub href (%) {
} }


my $use_pathinfo = gitweb_check_feature('pathinfo'); my $use_pathinfo = gitweb_check_feature('pathinfo');
if ($use_pathinfo) { if ($use_pathinfo and defined $params{'project'}) {
# try to put as many parameters as possible in PATH_INFO: # try to put as many parameters as possible in PATH_INFO:
# - project name # - project name
# - action # - action
@ -849,7 +849,7 @@ sub href (%) {
$href =~ s,/$,,; $href =~ s,/$,,;


# Then add the project name, if present # Then add the project name, if present
$href .= "/".esc_url($params{'project'}) if defined $params{'project'}; $href .= "/".esc_url($params{'project'});
delete $params{'project'}; delete $params{'project'};


# since we destructively absorb parameters, we keep this # since we destructively absorb parameters, we keep this
@ -6222,7 +6222,11 @@ sub git_atom {
sub git_opml { sub git_opml {
my @list = git_get_projects_list(); my @list = git_get_projects_list();


print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print $cgi->header(
-type => 'text/xml',
-charset => 'utf-8',
-content_disposition => 'inline; filename="opml.xml"');

print <<XML; print <<XML;
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<opml version="1.0"> <opml version="1.0">