X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=cf78ba0e33834bb5cceaaf7ab2f47509d326aca6;hb=1410e014d23f244e73d3a7916a61c2473416bab9;hp=5f70cb0a83e8cfff8dd7d4332a9e5983dcc87377;hpb=db1f357f01e1ebb16a31fdcd3e432a1d19b54ae3;p=mailer.git

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 5f70cb0a83..cf78ba0e33 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,7 +49,7 @@ if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
 
 // Query the pool
 $result = SQL_QUERY('SELECT
-	`id`, `sender`, `subject`, `payment_id`, `cat_id`
+	`id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 ORDER BY
@@ -61,7 +59,13 @@ ORDER BY
 if (!SQL_HASZERONUMS($result)) {
 	if (isFormSent()) {
 		// Make mail editable...
-		$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT
+	`id`, `sender` AS `userid`, `subject`, `text`, `url`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`id`=%s
+LIMIT 1",
 			array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
 
 		// Fetch row
@@ -97,7 +101,7 @@ LIMIT 1",
 		}
 
 		// Display message
-		loadTemplate('admin_settings_saved', false, $content);
+		displayMessage($content);
 	} else {
 		// There are mail orders available
 		$OUT = '';
@@ -114,7 +118,7 @@ LIMIT 1",
 	}
 } else {
 	// No mail orders left in pool
-	loadTemplate('admin_settings_saved', false, '<span class="notice">{--ADMIN_NO_MAILS_IN_POOL--}</span>');
+	displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]