fix new user welcome message upgrade script

dleffler · dleffler · commit 862cf6f7e0ee · 2025-08-29T10:05:32.000-04:00
diff --git a/install/upgrades/upgrade_newusermsg.php b/install/upgrades/upgrade_newusermsg.php
@@ -52,9 +52,7 @@ function description()
      */
     function needed()
     {
-        $tmp = (empty(USER_REGISTRATION_WELCOME_MSG_HTML) && !empty(USER_REGISTRATION_WELCOME_MSG));
-        $tmp1 = !defined('USER_REGISTRATION_WELCOME_MSG_HTML');
-        return (!defined('USER_REGISTRATION_WELCOME_MSG_HTML') || (empty(USER_REGISTRATION_WELCOME_MSG_HTML) && !empty(USER_REGISTRATION_WELCOME_MSG)));
+        return empty(USER_REGISTRATION_WELCOME_MSG_HTML);
     }
 
     /**
@@ -66,7 +64,6 @@ function needed()
     function upgrade()
     {
         expSettings::change('USER_REGISTRATION_WELCOME_MSG_HTML', USER_REGISTRATION_WELCOME_MSG);
-
         return gt('New User Welcome Message was Upgraded.');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ function description()`
`52`	`52`	`*/`
`53`	`53`	`function needed()`
`54`	`54`	`{`
`55`		`- $tmp = (empty(USER_REGISTRATION_WELCOME_MSG_HTML) && !empty(USER_REGISTRATION_WELCOME_MSG));`
`56`		`- $tmp1 = !defined('USER_REGISTRATION_WELCOME_MSG_HTML');`
`57`		`- return (!defined('USER_REGISTRATION_WELCOME_MSG_HTML') \|\| (empty(USER_REGISTRATION_WELCOME_MSG_HTML) && !empty(USER_REGISTRATION_WELCOME_MSG)));`
	`55`	`+ return empty(USER_REGISTRATION_WELCOME_MSG_HTML);`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`/**`
`@@ -66,7 +64,6 @@ function needed()`
`66`	`64`	`function upgrade()`
`67`	`65`	`{`
`68`	`66`	`expSettings::change('USER_REGISTRATION_WELCOME_MSG_HTML', USER_REGISTRATION_WELCOME_MSG);`
`69`		`-`
`70`	`67`	`return gt('New User Welcome Message was Upgraded.');`
`71`	`68`	`}`
`72`	`69`	`}`