Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

! Fix a long standing bug with the mail queue using the wrong variable by accident and do a little clean-up in the process to use the {literal:str} syntax I added.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 years ago
parent
1fde680fd4
commit
d41d85a580
2 changed files with 5 additions and 9 deletions
Split View Show Diff Stats
  1. 4 7
      Sources/ScheduledTasks.php
  2. 1 2
      Sources/Subs-Post.php

+ 4 - 7
Sources/ScheduledTasks.php
View File 

@@ -873,11 +873,10 @@ function ReduceMailQueue($number = false, $override_limit = false, $force_send =
 
 		$smcFunc['db_query']('', '
 
 			UPDATE {db_prefix}settings
 
 			SET value = {string:next_mail_send}
 
-			WHERE variable = {string:mail_next_send}
 
+			WHERE variable = {literal:mail_next_send}
 
 				AND value = {string:last_send}',
 
 			array(
 
 				'next_mail_send' => time() + $delay,
 
-				'mail_next_send' => 'mail_next_send',
 
 				'last_send' => $modSettings['mail_next_send'],
 
 			)
 
 		);
 
@@ -953,11 +952,10 @@ function ReduceMailQueue($number = false, $override_limit = false, $force_send =
 
 		$smcFunc['db_query']('', '
 
 			UPDATE {db_prefix}settings
 
 			SET value = {string:no_send}
 
-			WHERE variable = {string:mail_next_send}
 
+			WHERE variable = {literal:mail_next_send}
 
 				AND value = {string:last_mail_send}',
 
 			array(
 
 				'no_send' => '0',
 
-				'mail_next_send' => 'mail_next_send',
 
 				'last_mail_send' => $modSettings['mail_next_send'],
 
 			)
 
 		);
 
@@ -1013,12 +1011,11 @@ function ReduceMailQueue($number = false, $override_limit = false, $force_send =
 
 		if ($modSettings['mail_failed_attempts'] > 5)
 
 			$smcFunc['db_query']('', '
 
 				UPDATE {db_prefix}settings
 
-				SET value = {string:mail_next_send}
 
-				WHERE variable = {string:next_mail_send}
 
+				SET value = {string:next_mail_send}
 
+				WHERE variable = {literal:mail_next_send}
 
 					AND value = {string:last_send}',
 
 				array(
 
 					'next_mail_send' => time() + 60,
 
-					'mail_next_send' => 'mail_next_send',
 
 					'last_send' => $modSettings['mail_next_send'],
 
 			));

+ 1 - 2
Sources/Subs-Post.php
View File 

@@ -739,11 +739,10 @@ function AddMailQueue($flush = false, $to_array = array(), $subject = '', $messa
 
 		$smcFunc['db_query']('', '
 
 			UPDATE {db_prefix}settings
 
 			SET value = {string:nextSendTime}
 
-			WHERE variable = {string:mail_next_send}
 
+			WHERE variable = {literal:mail_next_send}
 
 				AND value = {string:no_outstanding}',
 
 			array(
 
 				'nextSendTime' => $nextSendTime,
 
-				'mail_next_send' => 'mail_next_send',
 
 				'no_outstanding' => '0',
 
 			)
 
 		);