More language strings renamed, TODOs.txt updated:

[mailer.git] / inc / reset / reset_holiday.php

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index bf8fffcb42c3047d68c8c83378214bc73d6a0980..8afdbb80b5302552ed3c35bcedaef43a6a02e802 100644 (file)
--- 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 ((getScriptOutputMode() != 0) || ((!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_SUBJ--}', $message);
+                       sendEmail($content['userid'], '{--MEMBER_HOLIDAY_ACTIVATED_SUBJECT--}', $message);
 
                        // Update account
                        addSql(SQL_QUERY_ESC("UPDATE