Fixes + asserts

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

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index d7daeab73c8a7f8134e35a5986b29d3bc090c043..0edbbec6f1a703ca49999c01b4602832d37d26a7 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -635,7 +635,7 @@ function doExpressionSponsor ($data) {
                        // Sponsor data found
                        $functionName = "getFetchedSponsorData('id', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
                }
-       } elseif ((!empty($data['callback'])) && (isSponsorDataValid())) {
+       } elseif ((!empty($data['callback'])) && (isValidSponsorData())) {
                // "Call-back" alias column for current logged in sponsor's data
                $functionName = "getSponsorData('" . $data['callback'] . "')";
        }
@@ -670,11 +670,11 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
                if (!isValidId($sponsor_id)) {
                        // Invalid, so abort here
                        reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
-               } elseif (isSponsorDataValid()) {
+               } elseif (isValidSponsorData()) {
                        // Use cache, so it is fine
                        return TRUE;
                }
-       } elseif (isSponsorDataValid()) {
+       } elseif (isValidSponsorData()) {
                // Use cache, so it is fine
                return TRUE;
        }
@@ -726,7 +726,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
                } // END - if
 
                // Found, but valid?
-               $found = isSponsorDataValid();
+               $found = isValidSponsorData();
        } // END - if
 
        // Free memory
@@ -766,7 +766,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
 
 // Checks if the sponsor data is valid, this may indicate that the sponsor has logged
 // in, but you should use isMember() if you want to find that out.
-function isSponsorDataValid () {
+function isValidSponsorData () {
        // Sponsor id should not be zero so abort here
        if (!isCurrentSponsorIdSet()) return FALSE;