summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-12-05 17:35:10 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-12-05 17:35:10 +0100
commitd6c87445aa63af62cf5b93d546807afc2429e7fd (patch)
tree762949a7f574ed7883f0bcfddbf560e15a965037 /Bugzilla
parentf3bcc1d514bb75557a2da8404b468e4e34e76d95 (diff)
parentd8b74774531bf854695f6b1497a405bc78b54559 (diff)
downloadbugzilla-d6c87445aa63af62cf5b93d546807afc2429e7fd.tar.gz
bugzilla-d6c87445aa63af62cf5b93d546807afc2429e7fd.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/User.pm29
-rw-r--r--Bugzilla/WebService/Bug.pm4
2 files changed, 32 insertions, 1 deletions
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 0b4c1c867..151919bf8 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -2213,6 +2213,35 @@ Returns a hashref with tag IDs as key, and a hashref with tag 'id',
=back
+=head2 Saved Recent Bug Lists
+
+=over
+
+=item C<recent_searches>
+
+Returns an arrayref of L<Bugzilla::Search::Recent> objects
+containing the user's recent searches.
+
+=item C<recent_search_containing(bug_id)>
+
+Returns a L<Bugzilla::Search::Recent> object that contains the most recent
+search by the user for the specified bug id. Retuns undef if no match is found.
+
+=item C<recent_search_for(bug)>
+
+Returns a L<Bugzilla::Search::Recent> object that contains a search by the
+user. Uses the list_id of the current loaded page, or the referrer page, and
+the bug id if that fails. Finally it will check the BUGLIST cookie, and create
+an object based on that, or undef if it does not exist.
+
+=item C<save_last_search>
+
+Saves the users most recent search in the database if logged in, or in the
+BUGLIST cookie if not logged in. Parameters are bug_ids, order, vars and
+list_id.
+
+=back
+
=head2 Account Lockout
=over
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 1722086cd..4018cfa6e 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -2604,7 +2604,9 @@ these bugs.
=item C<data>
-B<Required> C<base64> The content of the attachment.
+B<Required> C<base64> or C<string> The content of the attachment.
+If the content of the attachment is not ASCII text, you must encode
+it in base64 and declare it as the C<base64> type.
=item C<file_name>