Skip to content
Snippets Groups Projects
Commit 83d727b4 authored by Nate Lampton's avatar Nate Lampton
Browse files

Merge branch '7.x-2.x' of quicksketch@git.drupal.org:project/flag.git into 7.x-2.x

parents 753cf25c d97949a8
No related branches found
No related tags found
No related merge requests found
......@@ -455,3 +455,10 @@ function flag_update_6208() {
db_add_index('flag_counts', 'fid_count', array('fid', 'count'));
db_add_index('flag_counts', 'fid_last_updated', array('fid', 'last_updated'));
}
/**
* Clear caches.
*/
function flag_update_7201() {
// Do nothing. Update.php is going to clear caches for us.
}
......@@ -350,7 +350,7 @@ function flag_rules_condition_info() {
'type' => $type,
'label' => $label,
),
'user' => array(
'flagging_user' => array(
'type' => 'user',
'label' => t('User on whose behalf to check'),
'description' => t('For non-global flags, this is the user on whose behalf the flag is checked.'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment