Commit fea41b63 authored by Dries's avatar Dries

- Patch #468630 by Berdir: fixed error with publishing comments.

parent 2ad42112
......@@ -62,7 +62,7 @@ function hook_comment_update($form_values) {
* @return
* Nothing.
*/
function hook_comment_view(&$comment) {
function hook_comment_view($comment) {
// how old is the comment
$comment->time_ago = time() - $comment->timestamp;
}
......@@ -71,12 +71,12 @@ function hook_comment_view(&$comment) {
* The comment is being published by the moderator.
*
* @param $form_values
* Passes in an array of form values submitted by the user.
* Passes in the comment the action is being performed on.
* @return
* Nothing.
*/
function hook_comment_publish($form_values) {
drupal_set_message(t('Comment: @subject has been published', array('@subject' => $form_values['subject'])));
function hook_comment_publish($comment) {
drupal_set_message(t('Comment: @subject has been published', array('@subject' => $comment->subject)));
}
/**
......@@ -87,7 +87,7 @@ function hook_comment_publish($form_values) {
* @return
* Nothing.
*/
function hook_comment_unpublish(&$comment) {
function hook_comment_unpublish($comment) {
drupal_set_message(t('Comment: @subject has been unpublished', array('@subject' => $comment->subject)));
}
......@@ -99,7 +99,7 @@ function hook_comment_unpublish(&$comment) {
* @return
* Nothing.
*/
function hook_comment_delete(&$comment) {
function hook_comment_delete($comment) {
drupal_set_message(t('Comment: @subject has been deleted', array('@subject' => $comment->subject)));
}
......
......@@ -948,7 +948,8 @@ function comment_save($edit) {
}
else {
drupal_set_message(t('Your comment has been posted.'));
comment_invoke_comment($edit, 'publish');
$comment = (object)$edit;
comment_invoke_comment($comment, 'publish');
}
return $edit['cid'];
......
......@@ -7,7 +7,7 @@ class CommentHelperCase extends DrupalWebTestCase {
protected $node;
function setUp() {
parent::setUp('comment');
parent::setUp('comment', 'search');
// Create users.
$this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer permissions', 'administer blocks'));
$this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content'));
......
......@@ -690,9 +690,9 @@ function search_comment_delete($comment) {
/**
* Implement hook_comment_publish().
*/
function search_comment_publish($form_values) {
function search_comment_publish($comment) {
// Reindex the node when comments are published.
search_touch_node($form_values['nid']);
search_touch_node($comment->nid);
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment