X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=829c80fea130af34e936297b514061d4897d51ed;hb=0851db137e420b90617f47b77de2302e770f5f02;hp=08fa2e50c288b79126e14226ac601289b3c16cb7;hpb=544aa3fb48613160f812515673e64c46d18d2e1d;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 08fa2e50c2..829c80fea1 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -448,15 +448,20 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
 			fetchUserData($userid, 'nickname');
 		} else {
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK!<br />");
-			/// Load by userid
+			// Load by userid
 			fetchUserData($userid);
 		}
 
 		// Merge data if valid
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE<br />");
 		if ((isUserDataValid()) && ($loadUserData === true)) {
+			// It is valid
 			$content = merge_array($content, getUserDataArray());
+
+			// But we don't like hashed passwords be mailed
+			unset($content['password']);
 		} // END - if
+
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER<br />");
 	} // END - if
 
@@ -689,7 +694,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 			$year = getYear();
 
 			// Use configured min age or fixed?
-			if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+			if (isExtensionInstalledAndNewer('other', '0.2.1')) {
 				// Configured
 				$startYear = $year - getConfig('min_age');
 			} else {
@@ -716,7 +721,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 				// Get current year and subtract the configured minimum age
 				$OUT .= '<option value="' . ($minYear - 1) . '">&lt;' . $minYear . '</option>';
 				// Calculate earliest year depending on extension version
-				if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+				if (isExtensionInstalledAndNewer('other', '0.2.1')) {
 					// Use configured minimum age
 					$year = getYear() - getConfig('min_age');
 				} else {