gitweb: use href() when generating URLs in OPML
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 2 Jan 2009 12:15:28 +0000 (13:15 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jan 2009 18:45:54 +0000 (10:45 -0800)
Since the OPML project list view was hand-coding the RSS and HTML URLs,
it didn't respect global options such as use_pathinfo. Make it use
href() to ensure consistency with the rest of the gitweb setup.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb/gitweb.perl
index 99f71b47c2a6b53bb52ce29e96361e7c2acbe19d..7999bb37d39431ff537f75ee03d01ee1ccceae77 100755 (executable)
@@ -6146,8 +6146,8 @@ sub git_opml {
                }
 
                my $path = esc_html(chop_str($proj{'path'}, 25, 5));
-               my $rss  = "$my_url?p=$proj{'path'};a=rss";
-               my $html = "$my_url?p=$proj{'path'};a=summary";
+               my $rss  = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1);
+               my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1);
                print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
        }
        print <<XML;