X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_holiday.php;h=f31c6f52a1266583ccbf65a0485a723d8c28cdad;hb=3b15416a92af60582c1b622e2bff5ae476c647c1;hp=62afa6a80ef5f510b2163bc24ca2964eccfd4e6c;hpb=58bd7e0df5e4bee593b7ad46d66d3b1acbec2886;p=mailer.git

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 62afa6a80e..f31c6f52a1 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+} elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
 	// Do not execute when script is in CSS mode or no daily reset
 	return;
 } elseif (!isExtensionActive('holiday')) {
@@ -62,7 +62,7 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
 	// Init SQLs
 	initSqls();
 
@@ -94,7 +94,7 @@ LIMIT 1",
 
 			// Send email to user
 			$message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJECT--}', $message);
+			sendEmail($content['userid'], '{--MEMBER_HOLIDAY_ACTIVATED_SUBJECT--}', $message);
 
 			// Update account
 			addSql(SQL_QUERY_ESC("UPDATE