X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-html_mail.php;h=f5ef2e499522194bf61b338fde0ecd7b81f09744;hb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a;hp=7ca346b0d246a1d380147780087d4aa303b20713;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 7ca346b0d2..f5ef2e4995 100644
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/25/2004 *
- * ================                             Last change: 04/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 04/25/2004 *
+ * ===================                          Last change: 04/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-html_mail.php                               *
@@ -55,26 +55,22 @@ if ((!isExtensionActive('html_mail')) && (!isAdmin())) {
 if (isFormSent()) {
 	// Save settings
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `html`='%s' WHERE `userid`=%s LIMIT 1",
-		array(postRequestElement('html'), getUserId()), __FILE__, __LINE__);
+		array(postRequestElement('html'), getMemberId()), __FILE__, __LINE__);
 	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SETTINGS_SAVED'));
 } else {
 	// Load template for changing settings
-	$result = SQL_QUERY_ESC("SELECT `html` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-		array(getUserId()), __FILE__, __LINE__);
-
-	// Get the mode
-	$content = SQL_FETCHARRAY($result);
-
-	// Free result
-	SQL_FREERESULT($result);
+	if (!fetchUserData(getMemberId())) {
+		// Something really bad happened
+		debug_report_bug('No user account ' . getMemberId() . ' found.');
+	} // END - if
 
 	// Prepare it
 	$content['html_y'] = '';
 	$content['html_n'] = '';
-	$content['html_' . strtolower($content['html'])] = ' checked="checked"';
+	$content['html_' . strtolower(getUserData('html'))] = ' checked="checked"';
 
 	// Load main template
-	loadTemplate('member_html_mail_settings');
+	loadTemplate('member_html_mail_settings', false, $content);
 }
 
 // [EOF]