earning_name renamed to earning_provider

[mailer.git] / inc / extensions / ext-forced.php

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index fc0eb66b93419d760619a5d43b6d0e13bec3dd94..1c8c17f75932906b4ddee5d96495909d0ab2ac69 100644 (file)
--- a/inc/extensions/ext-forced.php
+++ b/inc/extensions/ext-forced.php
@@ -134,7 +134,7 @@ INDEX (`forced_stats_userid`)",
                addMemberMenuSql('extras', 'book_forced', 'Forced-Kampagne buchen', 3);
 
                // Register Forced-PopUps with earning_data table
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_earning_data` (`earning_group`,`earning_name`,`earning_sorting`) VALUES ('POPUP','FORCED_POPUP',1)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_earning_data` (`earning_group`,`earning_provider`,`earning_sorting`) VALUES ('POPUP','FORCED_POPUP',1)");
 
                // Register filters
                registerFilter('add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', false, true, isExtensionDryRun());
@@ -152,8 +152,11 @@ INDEX (`forced_stats_userid`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='forced'");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('forced_banner','forced_textlink','book_forced') LIMIT 3");
 
-               // Unregister Forced-PopUps from earning_data
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_earning_data` WHERE `earning_name`='FORCED_POPUP' LIMIT 1");
+               // Is earning_data there?
+               if (isSqlTableCreated('earning_data')) {
+                       // Unregister Forced-PopUps from earning_data
+                       addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_earning_data` WHERE `earning_provider`='FORCED_POPUP' LIMIT 1");
+               } // END - if
 
                // Remove filter
                unregisterFilter(__FUNCTION__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', true, isExtensionDryRun());