From a30203a40a01c54bb2e10f6b14dc0a2ad3aa5c06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 4 Jul 2011 01:04:59 +0000 Subject: [PATCH] More fixes/missing language id added --- inc/language/coupon_de.php | 1 + inc/libs/register_functions.php | 2 +- inc/mysql-manager.php | 4 ++-- inc/template-functions.php | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/language/coupon_de.php b/inc/language/coupon_de.php index 58efbaf453..81493bcf21 100644 --- a/inc/language/coupon_de.php +++ b/inc/language/coupon_de.php @@ -57,6 +57,7 @@ addMessages(array( 'ADMIN_SEND_COUPON' => "Gutschein versenden", 'ADMIN_SEND_COUPON_POINTS_NOT_ENTERED' => "Bitte geben Sie eine Vergütung (in {?POINTS?}) ein.", 'ADMIN_SEND_COUPON_DESCRIPTION_NOT_ENTERED' => "Bitte geben Sie eine kurze Beschreibung (oder einen Hinweis an Ihre Mitglieder) ein.", + 'ADMIN_SEND_COUPON_USER_404' => "Es wurden keine empfangsbereiten Mitglieder gefunden!", 'ADMIN_SEND_COUPON_DONE' => "Es wurde ein Gutschein an alle empfangsbereiten Mitglieder versendet.", // Admin - More diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index f1c329ea0b..20d35c2ce7 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -305,7 +305,7 @@ function doRegistration () { } // END - if // Second: active rallye - if (!isBonusNewMemberNotifyEnabled()) { + if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) { $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`'; $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()'; } // END - if diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 5afeccf214..8936a5a27a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -2068,7 +2068,7 @@ function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) { } // END - if // Return the result - return $columName; + return $columnName; } // Determines the payment method for given extension and 'locked' @@ -2086,7 +2086,7 @@ function getPaymentMethodFromExtensionName ($ext_name) { $paymentMethod = $pointsData['payment_method']; // Return the result - return $columName; + return $paymentMethod; } // [EOF] diff --git a/inc/template-functions.php b/inc/template-functions.php index 7d5e670a2c..829c80fea1 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -694,7 +694,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo $year = getYear(); // Use configured min age or fixed? - if (isExtensionInstalledAndNewer('order', '0.2.1')) { + if (isExtensionInstalledAndNewer('other', '0.2.1')) { // Configured $startYear = $year - getConfig('min_age'); } else { @@ -721,7 +721,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo // Get current year and subtract the configured minimum age $OUT .= ''; // Calculate earliest year depending on extension version - if (isExtensionInstalledAndNewer('order', '0.2.1')) { + if (isExtensionInstalledAndNewer('other', '0.2.1')) { // Use configured minimum age $year = getYear() - getConfig('min_age'); } else { -- 2.30.2