From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 20 Aug 2012 09:00:03 +0000 (+0200)
Subject: Bug 698068: The "There is no saved search named ..." page has a "forget" link
X-Git-Tag: bugzilla-4.3.3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c7ad1823fc93fb28d4ad4270bccbd0a186e0ac;p=thirdparty%2Fbugzilla.git

Bug 698068: The "There is no saved search named ..." page has a "forget" link
r=glob a=LpSolit
---

diff --git a/Bugzilla/Search/Saved.pm b/Bugzilla/Search/Saved.pm
index f7d5971d40..c9885c9cec 100644
--- a/Bugzilla/Search/Saved.pm
+++ b/Bugzilla/Search/Saved.pm
@@ -96,7 +96,7 @@ sub check {
     if (!$search->shared_with_group
         or !$user->in_group($search->shared_with_group)) 
     {
-        ThrowUserError('missing_query', { queryname => $search->name, 
+        ThrowUserError('missing_query', { name => $search->name,
                                           sharer_id => $search->user->id });
     }
 
diff --git a/buglist.cgi b/buglist.cgi
index 13a2ef043c..3466b46817 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -183,7 +183,7 @@ sub LookupNamedQuery {
     Bugzilla->login(LOGIN_REQUIRED);
 
     my $query = Bugzilla::Search::Saved->check(
-        { user => $sharer_id, name => $name });
+        { user => $sharer_id, name => $name, _error => 'missing_query' });
 
     $query->url
        || ThrowUserError("buglist_parameters_required");
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 2d79bf851b..41205ccb6b 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1171,7 +1171,7 @@
     [% title = "Missing Search" %]
     [% docslinks = {'query.html' => "Searching for $terms.bugs",
                     'query.html#list' => "$terms.Bug lists"} %]
-    The search named <em>[% queryname FILTER html %]</em>
+    The search named <em>[% name FILTER html %]</em>
     [% IF sharer_id && sharer_id != user.id %]
       has not been made visible to you.
     [% ELSE %]