Merge branch 'stable-2.8'

* stable-2.8:
  Comment Added stream event should be fired even if mail is not sent
  Update the revision of the cookbook plugin
  Fix minor typo in REST API accounts documentation

Change-Id: I5a74825e06ef0906b637e30877d6b10d5ec1b00a
This commit is contained in:
David Pursehouse 2014-02-24 19:14:00 +09:00
commit 4b0fceae0b
2 changed files with 11 additions and 9 deletions

View File

@ -113,7 +113,7 @@ If the account does not have a name an empty string is returned.
Sets the full name of an account. Sets the full name of an account.
The new account name must be provided in the request body inside The new account name must be provided in the request body inside
a link:#account-name-input[AccountNameInput] entity. an link:#account-name-input[AccountNameInput] entity.
.Request .Request
---- ----

View File

@ -156,7 +156,8 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
} else { } else {
indexWrite = Futures.<Void, IOException> immediateCheckedFuture(null); indexWrite = Futures.<Void, IOException> immediateCheckedFuture(null);
} }
if (input.notify.compareTo(NotifyHandling.NONE) > 0 && message != null) { if (message != null) {
if (input.notify.compareTo(NotifyHandling.NONE) > 0) {
email.create( email.create(
input.notify, input.notify,
change, change,
@ -164,6 +165,7 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
revision.getAccountId(), revision.getAccountId(),
message, message,
comments).sendAsync(); comments).sendAsync();
}
fireCommentAddedHook(revision); fireCommentAddedHook(revision);
} }