Provide a hook_flag_default_flags_alter to allow altering of default definations

Seems reasonable enough -- allows things like altering Features, or flags provided by modules.

+++ b/flag.api.php
@@ -54,6 +54,15 @@ function hook_flag_default_flags() {
+ * Alter the defination of default flags.

Typo: 'definition'.

+++ b/flag.api.php
@@ -54,6 +54,15 @@ function hook_flag_default_flags() {
+function hook_flag_default_flags_alter(&$flags) {

Needs a @param.

+++ b/flag.module
@@ -1420,32 +1420,37 @@ function flag_get_default_flags($include_disabled = FALSE) {
+      $default_flags_info[$flag_name] = $flag_info += array(

That += can just be a + as we're not doing anything else with $flag_info.

+++ b/flag.module
@@ -1420,32 +1420,37 @@ function flag_get_default_flags($include_disabled = FALSE) {
+  drupal_alter('flag_default_flags', $default_flags_info);

Comment please -- helps find where hooks are invoked.

Here's the patch with feedback from #2 incorporated.

I'm going to be bold and mark this as RTBC. The patch in #3 still applies. I looked at the diff between the two patches and #3 fixes everything as suggested in #2, which is primarily comments. I've applied and tested the patch and it is working.

Committed. Thanks to everyone who worked on this.

We need to make a patch to be ported back to the 2.x branch, since this patch with the recent version of flag 2.2 causes #2283113: Default flags in most recent version causes notification page to fail on install.

How does a 3.x patch cause a bug in Flag 2.2???