Fixes for unset config entries and ['header'] entry

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index d85b9fea8159956842c7bc8ac562ac8440f64bbe..1ba7228f043febb1a9cee3dc5370a8defca543bc 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -626,12 +626,13 @@ LIMIT 1",
                                                } // END - if
                                        } // END - foreach
 
+                                       // No content is default
+                                       $content['zip_content'] = '';
+
                                        if (isPostRequestParameterSet('zip')) {
                                                // Output entered ZIP code
                                                $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
-                                       } else {
-                                               $content['zip_content'] = '<tr><td colspan="3" height="5" class="seperator">&nbsp;</td></tr>';
-                                       }
+                                       } // END - if
 
                                        // HTML extension
                                        if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
@@ -646,10 +647,8 @@ LIMIT 1",
                                        loadTemplate('member_order_page2', false, $content);
                                } else {
                                        // Remember maybe entered ZIP code in constant
-                                       $add = '';
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active
-                                               if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = '<tr><td colspan="3" class="seperator bottom" height="5">&nbsp;</td></tr>';
                                                $content['html_extension'] = loadTemplate('member_order-html_intro', true);
                                        } else {
                                                // No HTML extension installed
@@ -664,13 +663,11 @@ LIMIT 1",
                                                // Yes
                                                if (postRequestParameter('zip') > 0) {
                                                        $data = array(
-                                                               'zip' => bigintval(postRequestParameter('zip')),
-                                                               'add' => $add
+                                                               'zip' => bigintval(postRequestParameter('zip'))
                                                        );
                                                } else {
                                                        $data = array(
-                                                               'zip' => '',
-                                                               'add' => $add
+                                                               'zip' => ''
                                                        );
                                                }
                                                $content['zip_content'] = loadTemplate('member_order-zip1', true, $data);