mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'gb/gitweb-opml'
* gb/gitweb-opml: gitweb: suggest name for OPML view gitweb: don't use pathinfo for global actions
This commit is contained in:
commit
094f75b433
|
@ -834,7 +834,7 @@ (%)
|
|||
}
|
||||
|
||||
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 @@ (%)
|
|||
$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">
|
||||
|
|
Loading…
Reference in a new issue