Permalink
Browse files

Merge branch 'MDL-27891-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
  • Loading branch information...
2 parents 2366648 + 5b41faa commit 658a15bd31d3be350b9825fae3ca01f982486775 @stronk7 stronk7 committed Feb 8, 2012
Showing with 6 additions and 1 deletion.
  1. +1 −0 lib/db/log.php
  2. +5 −1 tag/user.php
View
@@ -48,4 +48,5 @@
array('module'=>'message', 'action'=>'unblock contact', 'mtable'=>'user', 'field'=>$DB->sql_concat('firstname', "' '" , 'lastname')),
array('module'=>'group', 'action'=>'view', 'mtable'=>'groups', 'field'=>'name'),
array('module'=>'tag', 'action'=>'update', 'mtable'=>'tag', 'field'=>'name'),
+ array('module'=>'tag', 'action'=>'flag', 'mtable'=>'tag', 'field'=>'name'),
);
View
@@ -45,7 +45,11 @@
case 'flaginappropriate':
- tag_set_flag(tag_get_id($tag));
+ $tagid = tag_get_id($tag);
+ // Add flaging action to logs
+ add_to_log(SITEID, 'tag', 'flag', 'index.php?id='. $tagid, $tagid, '', $USER->id);
+
+ tag_set_flag($tagid);
redirect($CFG->wwwroot.'/tag/index.php?tag='. rawurlencode($tag), get_string('responsiblewillbenotified', 'tag'));
break;

0 comments on commit 658a15b

Please sign in to comment.