diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-12-31 06:27:45 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-12-31 06:27:45 +0100 |
| commit | cae26fc87f03b8fb44376932c06e2d3d7411a065 (patch) | |
| tree | 90fc5ce6dddfa3569abc588b17e70531a0a5e169 | |
| parent | 268ddeef80cc9217d1d1fd7f34036c60100c602f (diff) | |
| parent | 2823e7d3d291c77bf4bef8c1576076ed44c2185c (diff) | |
| download | bugzilla-cae26fc87f03b8fb44376932c06e2d3d7411a065.tar.gz bugzilla-cae26fc87f03b8fb44376932c06e2d3d7411a065.tar.xz | |
merged with bugzilla/4.2
| -rw-r--r-- | Bugzilla/Auth/Persist/Cookie.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/WebService/Bug.pm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm index 1daaf57f7..c1d133772 100644 --- a/Bugzilla/Auth/Persist/Cookie.pm +++ b/Bugzilla/Auth/Persist/Cookie.pm @@ -139,7 +139,8 @@ sub logout { push(@login_cookies, $login_token->{'login_token'}); } - return if !@login_cookies; + # Make sure that @login_cookies is not empty to not break SQL statements. + push(@login_cookies, '') unless @login_cookies; # These queries use both the cookie ID and the user ID as keys. Even # though we know the userid must match, we still check it in the SQL diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index 3efe6aa1f..fbf084862 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -2644,7 +2644,7 @@ narrowed down to specific products. =item C<summary> (string) B<Required> - A string of keywords defining the type of bug you are trying to report. -=item C<products> (array) - One or more product names to narrow the +=item C<product> (array) - One or more product names to narrow the duplicate search to. If omitted, all bugs are searched. =back |