Merge pull request #7201 from live627/cal

Users without valid birthdates were falsely selected

Author: jdarwood007

Sources/Subs-Calendar.php

@@ -36,52 +36,42 @@ function getBirthdayRange($low_date, $high_date)
 	if ($smcFunc['db_title'] !== POSTGRE_TITLE)
 	{
 		// Collect all of the birthdays for this month.  I know, it's a painful query.
-		$result = $smcFunc['db_query']('birthday_array', '
+		$result = $smcFunc['db_query']('', '
 			SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
 			FROM {db_prefix}members
-			WHERE MONTH(birthdate) != {int:no_month}
-				AND DAYOFMONTH(birthdate) != {int:no_day}
-				AND YEAR(birthdate) <= {int:max_year}
+			WHERE birthdate != {date:no_birthdate}
 				AND (
 					DATE_FORMAT(birthdate, {string:year_low}) BETWEEN {date:low_date} AND {date:high_date}' . ($year_low == $year_high ? '' : '
 					OR DATE_FORMAT(birthdate, {string:year_high}) BETWEEN {date:low_date} AND {date:high_date}') . '
 				)
 				AND is_activated = {int:is_activated}',
 			array(
 				'is_activated' => 1,
-				'no_month' => 0,
-				'no_day' => 0,
+				'no_birthdate' => '1004-01-01',
 				'year_low' => $year_low . '-%m-%d',
 				'year_high' => $year_high . '-%m-%d',
 				'low_date' => $low_date,
 				'high_date' => $high_date,
-				'max_year' => $year_high,
 			)
 		);
 	}
 	else
 	{
-		$result = $smcFunc['db_query']('birthday_array', '
+		$result = $smcFunc['db_query']('', '
 			SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
 			FROM {db_prefix}members
-			WHERE YEAR(birthdate) != {string:year_one}
-				AND MONTH(birthdate) != {int:no_month}
-				AND DAYOFMONTH(birthdate) != {int:no_day}
+			WHERE birthdate != {date:no_birthdate}
 				AND (
 					indexable_month_day(birthdate) BETWEEN indexable_month_day({date:year_low_low_date}) AND indexable_month_day({date:year_low_high_date})' . ($year_low == $year_high ? '' : '
-					OR  indexable_month_day(birthdate) BETWEEN indexable_month_day({date:year_high_low_date}) AND indexable_month_day({date:year_high_high_date})') . '
+					OR indexable_month_day(birthdate) BETWEEN indexable_month_day({date:year_high_low_date}) AND indexable_month_day({date:year_high_high_date})') . '
 				)
 				AND is_activated = {int:is_activated}',
 			array(
 				'is_activated' => 1,
-				'no_month' => 0,
-				'no_day' => 0,
-				'year_one' => '1004',
-				'year_low' => $year_low . '-%m-%d',
-				'year_high' => $year_high . '-%m-%d',
+				'no_birthdate' => '1004-01-01',
 				'year_low_low_date' => $low_date,
-				'year_low_high_date' => ($year_low == $year_high ? $high_date : $year_low . '-12-31'),
-				'year_high_low_date' => ($year_low == $year_high ? $low_date : $year_high . '-01-01'),
+				'year_low_high_date' => $year_low == $year_high ? $high_date : $year_low . '-12-31',
+				'year_high_low_date' => $year_low == $year_high ? $low_date : $year_high . '-01-01',
 				'year_high_high_date' => $high_date,
 			)
 		);