From adda190157a88b295d2d2a132941419133b8630d Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 6 Apr 2022 13:16:49 +0000
Subject: - Bugfix: Problem beim Upload von Bildern in der Mediathek bekomen
 (Bilder wurden nicht direkt nach Upload angezeigt)

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7979 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_abo/order_view.phtml                   | 2 +-
 views/mods/mod_kundenkontakt/order_index_bottom.phtml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml
index f93fefe..f3035dc 100644
--- a/views/mods/mod_abo/order_view.phtml
+++ b/views/mods/mod_abo/order_view.phtml
@@ -59,7 +59,7 @@
 					template: 'D MMM YYYY  HH:mm:ss',
 					combodate: {
 						minYear: 2000,
-						maxYear: <?php echo (intval(date('Y')) + 1); ?>,
+						maxYear: <?php echo (intval(date('Y')) + 10); ?>,
 						minuteStep: 1
 					}
 				}); 
diff --git a/views/mods/mod_kundenkontakt/order_index_bottom.phtml b/views/mods/mod_kundenkontakt/order_index_bottom.phtml
index b405b58..c42ad3d 100644
--- a/views/mods/mod_kundenkontakt/order_index_bottom.phtml
+++ b/views/mods/mod_kundenkontakt/order_index_bottom.phtml
@@ -142,8 +142,12 @@
             url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&do=kk_sendMail",
             data: {					
                 arOrderID: arOrderID,
+                <?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>
+                text: tinyMCE.activeEditor.getContent(),
+                <?php } else { ?>
                 text: el_wpsg_mod_kundenkontakt_text.value,
-                el_wpsg_mod_kundenkontakt_subject: el_wpsg_mod_kundenkontakt_subject.value
+                <?php } ?>
+                subject: el_wpsg_mod_kundenkontakt_subject.value
             },
             success: function(data) {
                     	            	
-- 
cgit v1.2.3