Extension ext-forced enhanced, some code cleanup:

[mailer.git] / inc / libs / holiday_functions.php

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index ce20531437a10b33bef763972d913f545da39168..5fe06735de477a959be3945268e7804d7d4a8922 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -53,7 +51,7 @@ WHERE
        `holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
        `userid` ASC", __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result_stop) > 0) {
+       if (!SQL_HASZERONUMS($result_stop)) {
                // We foud at least one
                $admin = '';
 
@@ -85,7 +83,7 @@ LIMIT 1",
 
                        // Send mail to user
                        $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJECT--}', $message);
+                       sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
                        $admin .= $content['userid']."\n";