Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 7504db5bada6386c885206e7849867c7d58ef9a5..2d5d26fa9af300d84339cf283937fcf42e9b7e2e 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -819,12 +819,15 @@ function sendModeMails ($mod, $modes) {
                                                        $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
                                                } // END - if
 
+                                               // Merge content with data from POST
+                                               $content = merge_array($content, REQUEST_POST_ARRAY());
+
                                                // Load template
-                                               $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, getUserId());
+                                               $msg = LOAD_EMAIL_TEMPLATE('member_mydata_notify', $content, getUserId());
 
                                                if (getConfig('admin_notify') == 'Y') {
                                                        // The admin needs to be notified about a profile change
-                                                       $msg_admin = "admin_mydata_notify";
+                                                       $msg_admin = 'admin_mydata_notify';
                                                        $sub_adm   = getMessage('ADMIN_CHANGED_DATA');
                                                } else {
                                                        // No mail to admin
@@ -839,10 +842,10 @@ function sendModeMails ($mod, $modes) {
                                                $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
                                                break;
 
-                                                               default:
-                                                                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                                                       $content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
-                                                                       break;
+                                       default: // Unsupported module!
+                                               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
+                                               $content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
+                                               break;
                                } // END - switch
                        } else {
                                // Could not load profile data