Required fix for NULL vs. 0 in user_points

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 842c06b81c2d82d3fa03d701b18cbd98a28a150f..5b6d0608692ef7d0f1aeff251ec03d0c7dc04ef6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -211,6 +211,7 @@ inc/filter/cache_filter.php svneol=native#text/plain
 inc/filter/coupon_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
+inc/filter/order_filter.php svneol=native#text/plain
 inc/filter/other_filter.php svneol=native#text/plain
 inc/filter/politician_stop_filter.php svneol=native#text/plain
 inc/filter/rallye_filter.php svneol=native#text/plain
@@ -219,9 +220,11 @@ inc/filter/removeip_filter.php svneol=native#text/plain
 inc/filter/theme_filter.php svneol=native#text/plain
 inc/filter/timezone_filter.php svneol=native#text/plain
 inc/filter/uberwach_filter.php svneol=native#text/plain
+inc/filter/user_filter.php svneol=native#text/plain
 inc/filters.php svneol=native#text/plain
 inc/fix_filters.php svneol=native#text/plain
 inc/fix_menu.php svneol=native#text/plain
+inc/fix_user_points.php svneol=native#text/plain
 inc/footer.php svneol=native#text/plain
 inc/functions.php svneol=native#text/plain
 inc/gen_mediadata.php svneol=native#text/plain
@@ -518,6 +521,7 @@ inc/modules/admin/what-list_network_types.php svneol=native#text/plain
 inc/modules/admin/what-list_networks.php svneol=native#text/plain
 inc/modules/admin/what-list_notifications.php svneol=native#text/plain
 inc/modules/admin/what-list_payouts.php svneol=native#text/plain
+inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain
 inc/modules/admin/what-list_primera.php svneol=native#text/plain
 inc/modules/admin/what-list_rallyes.php svneol=native#text/plain
 inc/modules/admin/what-list_refs.php svneol=native#text/plain
@@ -783,6 +787,7 @@ templates/de/emails/admin/admin_autopurge_turbo.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_autopurge_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_cashed.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_coupon_code.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
@@ -793,6 +798,7 @@ templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl svneol=native#text/
 templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_mydata_notify.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_newsletter_reset.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_order_normal.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_payout_request.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_payout_request_banner.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_expired.tpl svneol=native#text/plain
@@ -801,6 +807,7 @@ templates/de/emails/admin/admin_rallye_no_notify.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_notify.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_purged.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_refback.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_register_done.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_report_bug.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_reset_password.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_sponsor_change_data.tpl svneol=native#text/plain
@@ -836,6 +843,8 @@ templates/de/emails/admin/admin_surfbar_url_unlock.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_transfer_ap.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_transfer_points.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_user_pool_back.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_user_pool_done.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_wernis_request.tpl svneol=native#text/plain
 templates/de/emails/admins/.htaccess svneol=native#text/plain
 templates/de/emails/admins/admins_mail_contct_admin.tpl svneol=native#text/plain
@@ -858,12 +867,17 @@ templates/de/emails/del_sponsor.tpl svneol=native#text/plain
 templates/de/emails/done-admin.tpl svneol=native#text/plain
 templates/de/emails/done-member.tpl svneol=native#text/plain
 templates/de/emails/guest/.htaccess svneol=native#text/plain
+templates/de/emails/guest/guest_new_password.tpl svneol=native#text/plain
+templates/de/emails/guest/guest_register_done.tpl svneol=native#text/plain
 templates/de/emails/guest/guest_request_confirm.tpl svneol=native#text/plain
+templates/de/emails/guest/guest_user_confirmed.tpl svneol=native#text/plain
+templates/de/emails/guest/guest_user_confirmed_referal.tpl svneol=native#text/plain
 templates/de/emails/header.tpl svneol=native#text/plain
 templates/de/emails/html_header.tpl svneol=native#text/plain
 templates/de/emails/lock-user.tpl svneol=native#text/plain
 templates/de/emails/lock_sponsor.tpl svneol=native#text/plain
 templates/de/emails/member/.htaccess svneol=native#text/plain
+templates/de/emails/member/member_add_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_autopurge_delete.tpl svneol=native#text/plain
 templates/de/emails/member/member_autopurge_inactive.tpl svneol=native#text/plain
 templates/de/emails/member/member_autopurge_points.tpl svneol=native#text/plain
@@ -872,9 +886,12 @@ templates/de/emails/member/member_beg.tpl svneol=native#text/plain
 templates/de/emails/member/member_birthday.tpl svneol=native#text/plain
 templates/de/emails/member/member_birthday_confirm.tpl svneol=native#text/plain
 templates/de/emails/member/member_bonus.tpl svneol=native#text/plain
+templates/de/emails/member/member_bonus_pool_normal.tpl svneol=native#text/plain
 templates/de/emails/member/member_contct.tpl svneol=native#text/plain
 templates/de/emails/member/member_coupon.tpl svneol=native#text/plain
+templates/de/emails/member/member_coupon_code.tpl svneol=native#text/plain
 templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_activated.tpl svneol=native#text/plain
@@ -884,6 +901,10 @@ templates/de/emails/member/member_holiday_unlock.tpl svneol=native#text/plain
 templates/de/emails/member/member_lock_active_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_lock_locked_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_mydata_notify.tpl svneol=native#text/plain
+templates/de/emails/member/member_order_accepted.tpl svneol=native#text/plain
+templates/de/emails/member/member_order_deleted.tpl svneol=native#text/plain
+templates/de/emails/member/member_order_normal.tpl svneol=native#text/plain
+templates/de/emails/member/member_order_rejected.tpl svneol=native#text/plain
 templates/de/emails/member/member_payout_accepted.tpl svneol=native#text/plain
 templates/de/emails/member/member_payout_rejected.tpl svneol=native#text/plain
 templates/de/emails/member/member_payout_request.tpl svneol=native#text/plain
@@ -896,6 +917,7 @@ templates/de/emails/member/member_rallye_expired_silver.tpl svneol=native#text/p
 templates/de/emails/member/member_rallye_notify.tpl svneol=native#text/plain
 templates/de/emails/member/member_refback.tpl svneol=native#text/plain
 templates/de/emails/member/member_stats_bonus.tpl svneol=native#text/plain
+templates/de/emails/member/member_sub_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-unconfirmed.tpl svneol=native#text/plain
@@ -924,6 +946,12 @@ templates/de/emails/member/member_surfbar_url_unlock.tpl svneol=native#text/plai
 templates/de/emails/member/member_transfer_recipient.tpl svneol=native#text/plain
 templates/de/emails/member/member_transfer_sender.tpl svneol=native#text/plain
 templates/de/emails/member/member_undelete_active_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_deleted.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_locked.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_pool_back.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_pool_done.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_pool_normal.tpl svneol=native#text/plain
+templates/de/emails/member/member_user_unlocked.tpl svneol=native#text/plain
 templates/de/emails/member/member_wernis_accepted.tpl svneol=native#text/plain
 templates/de/emails/member/member_wernis_rejected.tpl svneol=native#text/plain
 templates/de/emails/member/member_wernis_request.tpl svneol=native#text/plain