-if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($CONFIG['bonus_active'] == 'Y'))
-{
- $ADD = ", 0, 0, 0";
- if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
-
- // Load data
- $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
-
- // We don't add this points now. This will be done after each month
- list($login, $turbo, $ref, $order, $stats) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
-
- // Prepare constants
- define('__TURBO_VALUE', TRANSLATE_COMMA($turbo));
- define('__LOGIN_VALUE', TRANSLATE_COMMA($login));
-
- if (GET_EXT_VERSION("bonus") >= "0.4.4")
- {
- // Add referral, stats and order bonys
- define('__REF_VALUE' , TRANSLATE_COMMA($ref));
- define('__ORDER_VALUE', TRANSLATE_COMMA($order));
- define('__STATS_VALUE', TRANSLATE_COMMA($stats));
- }
+if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) {
+ // Fetch some data and init others (to avoid a notice here)
+ $content['login'] = getUserData('login_bonus');
+ $content['turbo'] = getUserData('turbo_bonus');
+ $content['ref'] = '0.00000';
+ $content['order'] = '0.00000';
+ $content['stats'] = '0.00000';
+
+ // Get more data if ext-bonus is newer
+ if (getExtensionVersion('bonus') >= '0.4.4') {
+ $content['ref'] = getUserData('bonus_ref');
+ $content['order'] = getUserData('bonus_order');
+ $content['stats'] = getUserData('bonus_stats');
+ } // END - if