Projekt

Allgemein

Profil

GX-Bug #42024 » EMailAttachementFix.patch

/system/classes/orders/SendOrderProcess.inc.php - Till Tepelmann, 17.06.2015 19:26

Unterschiede anzeigen:

src/system/classes/orders/SendOrderProcess.inc.php (revision )
60 60
		if (gm_get_conf('ATTACH_CONDITIONS_OF_USE_IN_ORDER_CONFIRMATION') == 1)
61 61
		{
62 62
			$coo_shop_content_control->set_content_group('3');
63
			$t_mail_attachment_array[] = $coo_shop_content_control->get_file();
63
            $t_attachment = $coo_shop_content_control->get_file();
64
			if($t_attachment!==false) {
65
                $t_mail_attachment_array[] = $t_attachment;
64
		}
66
            }
67
		}
65 68

  
66 69
		if(gm_get_conf('ATTACH_WITHDRAWAL_INFO_IN_ORDER_CONFIRMATION') == '1')
67 70
		{
68 71
			$coo_shop_content_control->set_content_group(gm_get_conf('GM_WITHDRAWAL_CONTENT_ID'));
69
			$t_mail_attachment_array[] = $coo_shop_content_control->get_file();
72
            $t_attachment = $coo_shop_content_control->get_file();
73
            if($t_attachment!==false) {
74
                $t_mail_attachment_array[] = $t_attachment;
70
		}
75
            }
76
		}
71 77

  
72 78
		if(gm_get_conf('ATTACH_WITHDRAWAL_FORM_IN_ORDER_CONFIRMATION') == '1')
73 79
		{
74 80
			$coo_shop_content_control->set_content_group(gm_get_conf('GM_WITHDRAWAL_CONTENT_ID'));
75 81
			$coo_shop_content_control->set_withdrawal_form('1');
76
			$t_mail_attachment_array[] = $coo_shop_content_control->get_file();
82
            $t_attachment = $coo_shop_content_control->get_file();
83
            if($t_attachment!==false) {
84
                $t_mail_attachment_array[] = $t_attachment;
85
            }
77 86
		}
78 87

  
79 88
		$t_shop_content_query = xtc_db_query("SELECT
    (1-1/1)