Merge branch 'contrib' into 0.2.1-FINAL

[mailer.git] / inc / modules / member / what-categories.php

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index c884fbaafe8b093370cd24ce5019fc98cec673f7..bfa94889a4cacb4ebf4261861ee7e339c2f6abac 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -49,10 +49,10 @@ $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 
 // Get all categories
-$result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC', __FILE__, __LINE__);
+$result = sqlQuery('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC', __FILE__, __LINE__);
 
 // Are there entries?
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNums($result)) {
        $LEAST = FALSE;
        if (isFormSent()) {
                $count = '0';
@@ -60,7 +60,7 @@ if (!SQL_HASZERONUMS($result)) {
                        if ($joined != 'Y') $count++;
                } // END - foreach
 
-               if ((SQL_NUMROWS($result) - $count) < getLeastCats()) {
+               if ((sqlNumRows($result) - $count) < getLeastCats()) {
                        unsetPostRequestElement('ok');
                        $LEAST = TRUE;
                } // END - if
@@ -114,7 +114,7 @@ if (!SQL_HASZERONUMS($result)) {
 
                // Load all categories of this member
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Default he has not joined, add color switch
                        $content['jn'] = ' checked="checked"';
                        $content['jy'] = '';
@@ -139,7 +139,7 @@ if (!SQL_HASZERONUMS($result)) {
                } // END - while
 
                // Free result
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Load footer template
                loadTemplate('member_cats', FALSE, $OUT);
@@ -150,7 +150,7 @@ if (!SQL_HASZERONUMS($result)) {
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // [EOF]
 ?>