Bug 152632: My bugs query doesn't use the mybugstemplate parameter. Also removes the My Bugs query from the index page.

Patch by m@lcolm.org.uk (Malcolm Scott), r=jouni,gerv

3 files changed, 2 insertions, 3 deletions

diff --git a/index.cgi b/index.cgi
index 05f15d288..d5ee0d28d 100755
--- a/index.cgi
+++ b/index.cgi
@@ -54,7 +54,6 @@ quietly_check_login();
 ###############################################################################
 
 $vars->{'username'} = $::COOKIE{'Bugzilla_login'} || '';
-$vars->{'subst'} = { 'userid' => $vars->{'username'} };
 
 # Return the appropriate HTTP response headers.
 print "Content-Type: text/html\n\n";
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 9e2f3040c..807c316b6 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -98,7 +98,8 @@
       
       <td colspan="3">
         [% IF user.showmybugslink %]
-          <a href="buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=[% user.login FILTER url_quote %]&amp;emailtype1=exact&amp;emailassigned_to1=1&amp;emailreporter1=1">My&nbsp;Bugs</a>
+          [% filtered_username = user.login FILTER url_quote %]
+          <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My&nbsp;Bugs</a>
           [% print_pipe = 1 %]
         [% END %]
 
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 08804d414..0b1f28e80 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -58,7 +58,6 @@ function addSidebar() {
   <a href="reports.cgi">Get summary reports</a><br>
   </p><p>
 [% IF username %]
-  <a href="[% PerformSubsts(Param('mybugstemplate'), subst) %]">My Bugs</a><br>
   <a href="userprefs.cgi">Change password or user preferences</a><br>
   <a href="relogin.cgi">Logout [% username FILTER html %]</a><br>
 [% ELSE %]