diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:07:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:07:19 -0800 |
| commit | 094f75b4330a68aba7e92b74ddb9282b9f083c6f (patch) | |
| tree | af84409f9aab4226e5426a1270a0d03a14754b49 /gitweb | |
| parent | 8f31355692f33944e9c1240de8b175c43f857de1 (diff) | |
| parent | ae35785e3a205cea04d228b00461f4906548fcc3 (diff) | |
| download | git-094f75b4330a68aba7e92b74ddb9282b9f083c6f.tar.gz git-094f75b4330a68aba7e92b74ddb9282b9f083c6f.tar.xz | |
Merge branch 'gb/gitweb-opml'
* gb/gitweb-opml:
gitweb: suggest name for OPML view
gitweb: don't use pathinfo for global actions
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 9a5cfb0cb..931db4f7e 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -834,7 +834,7 @@ sub href (%) { } 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: # - project name # - action @@ -849,7 +849,7 @@ sub href (%) { $href =~ s,/$,,; # Then add the project name, if present - $href .= "/".esc_url($params{'project'}) if defined $params{'project'}; + $href .= "/".esc_url($params{'project'}); delete $params{'project'}; # since we destructively absorb parameters, we keep this @@ -6222,7 +6222,11 @@ sub git_atom { sub git_opml { 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; <?xml version="1.0" encoding="utf-8"?> <opml version="1.0"> |