From c42cd485ec5309e639bfc9db3a63e599b113f48f Mon Sep 17 00:00:00 2001
From: Damien Regad <damien.regad@merckgroup.com>
Date: Tue, 3 Jan 2012 19:02:11 +0100
Subject: [PATCH] Inconsistent definition of 'relation' $g_notify_flags

In config_defaults_inc.php, the action for $g_notify_flags to alert
when relationships change is defined as 'relation'. This is the value
used by the email api. However, the manage_config_email_page.php used
a different value 'relationship' to store/retrieve the configuration.

This leads to inconsistent behavior: when defined in config_inc.php
with 'relation', the flags are set as expected, but not reflected in
the UI. When changed in the UI, the settings have no effect (e.g.
e-mails are sent even though the flag says they are disabled).

Fixes #13174
---
 manage_config_email_page.php |    4 ++--
 manage_config_email_set.php  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manage_config_email_page.php b/manage_config_email_page.php
index 46063e9..2556c1e 100644
--- a/manage_config_email_page.php
+++ b/manage_config_email_page.php
@@ -193,7 +193,7 @@
 		$t_actions[] = 'sponsor';
 	}
 
-	$t_actions[] = 'relationship';
+	$t_actions[] = 'relation';
 
 	$t_statuses = MantisEnum::getAssocArrayIndexedByValues( config_get( 'status_enum_string' ) );
 	foreach( $t_statuses as $t_status ) {
@@ -263,7 +263,7 @@
 			get_capability_row_for_email( lang_get( 'email_on_sponsorship_changed' ), 'sponsor' );
 		}
 
-		get_capability_row_for_email( lang_get( 'email_on_relationship_changed' ), 'relationship' );
+		get_capability_row_for_email( lang_get( 'email_on_relationship_changed' ), 'relation' );
 
 		$t_statuses = MantisEnum::getAssocArrayIndexedByValues( config_get( 'status_enum_string' ) );
 		foreach ( $t_statuses as $t_status => $t_label ) {
diff --git a/manage_config_email_set.php b/manage_config_email_set.php
index cf9a8d4..7b273b0 100644
--- a/manage_config_email_set.php
+++ b/manage_config_email_set.php
@@ -53,7 +53,7 @@
 		$t_valid_actions[] = 'sponsor';
 	}
 
-	$t_valid_actions[] = 'relationship';
+	$t_valid_actions[] = 'relation';
 
 	$t_statuses = MantisEnum::getAssocArrayIndexedByValues( config_get( 'status_enum_string' ) );
     ksort( $t_statuses );
-- 
1.7.5.4