Commit 63b17aaa authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Getting the accept friend to email requestor (Bug #1389906)" into 1.9_STABLE

parents ac990d28 de0c050e
...@@ -2049,6 +2049,9 @@ function acceptfriend_submit(Pieform $form, $values) { ...@@ -2049,6 +2049,9 @@ function acceptfriend_submit(Pieform $form, $values) {
db_commit(); db_commit();
require_once('activity.php');
activity_occurred('maharamessage', $n);
handle_event('addfriend', array('user' => $f->usr2, 'friend' => $f->usr1)); handle_event('addfriend', array('user' => $f->usr2, 'friend' => $f->usr1));
$SESSION->add_ok_msg(get_string('friendformacceptsuccess', 'group')); $SESSION->add_ok_msg(get_string('friendformacceptsuccess', 'group'));
......
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