Add long_process_timeout option to global_settings

Issue #27884
mantisbt · Jan 30, 2021 · a30b625 · a30b625
1 parent 75e9129
commit a30b625
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -4430,6 +4430,7 @@
 	'logo_url',
 	'logout_cookie',
 	'logout_redirect_page',
+	'long_process_timeout',
 	'manage_config_cookie',
 	'manual_url',
 	'neato_tool',

diff --git a/core/email_api.php b/core/email_api.php
@@ -1346,13 +1346,13 @@ function email_send( EmailData $p_email_data ) {
 	}
 
 	#apply DKIM settings
-	if( config_get( 'email_dkim_enable' ) ) {
-		$t_mail->DKIM_domain = config_get( 'email_dkim_domain' );
-		$t_mail->DKIM_private = config_get( 'email_dkim_private_key_file_path' );
-		$t_mail->DKIM_private_string = config_get( 'email_dkim_private_key_string' );
-		$t_mail->DKIM_selector = config_get( 'email_dkim_selector' );
-		$t_mail->DKIM_passphrase = config_get( 'email_dkim_passphrase' );
-		$t_mail->DKIM_identity = config_get( 'email_dkim_identity' );
+	if( config_get_global( 'email_dkim_enable' ) ) {
+		$t_mail->DKIM_domain = config_get_global( 'email_dkim_domain' );
+		$t_mail->DKIM_private = config_get_global( 'email_dkim_private_key_file_path' );
+		$t_mail->DKIM_private_string = config_get_global( 'email_dkim_private_key_string' );
+		$t_mail->DKIM_selector = config_get_global( 'email_dkim_selector' );
+		$t_mail->DKIM_passphrase = config_get_global( 'email_dkim_passphrase' );
+		$t_mail->DKIM_identity = config_get_global( 'email_dkim_identity' );
 	}
 
 	$t_mail->isHTML( false );              # set email format to plain text