Changeset 10392 for extensions/UserAdvManager/branches/2.20/maintain.inc.php

Timestamp:

Apr 15, 2011, 9:43:29 PM (13 years ago)

Author:

Eric

Message:

r10391 merged from trunk to branch 2.20

File:

• extensions/UserAdvManager/branches/2.20/maintain.inc.php (modified) (2 diffs)

extensions/UserAdvManager/branches/2.20/maintain.inc.php

@@ -22 +22 @@
 Best regards,
 
-The admin of the gallery.','false','false','false','false','false','Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery].','Sorry [username], your account has been deprecated due to a too long time passed since your last visit at [mygallery]. Please, use the following link to revalidate your account.',-1,-1,'Thank you for registering at [mygallery]. Your account has been manually validated by _admin_. You may now log in at _link_to_site_ and make any appropriate changes to your profile. Welcome to _name_of_site_!','false','You have requested a password reset on our gallery. Please, find below your new connection settings.','false','Sorry, your account has been deleted because you have not validated your registration in requested time. Please, try registration with a valid and non blocked email account.','false','false');
+The admin of the gallery.','false','false','false','false','false','Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery].','Sorry [username], your account has been deprecated due to a too long time passed since your last visit at [mygallery]. Please, use the following link to revalidate your account.',-1,-1,'Thank you for registering at [mygallery]. Your account has been manually validated by _admin_. You may now log in at _link_to_site_ and make any appropriate changes to your profile. Welcome to _name_of_site_!','false','You have requested a password reset on our gallery. Please, find below your new connection settings.','false','Sorry, your account has been deleted because you have not validated your registration in requested time. Please, try registration with a valid and non blocked email account.','false','false','false');
 
         $query = '
@@ -238 +238 @@
 /* Check for upgrade from 2.16 to 2.20 */
 /* *********************************** */
-  if (isset($conf['UserAdvManager_Version']) and $conf['UserAdvManager_Version'] == '2.16.0')
+  if (isset($conf['UserAdvManager_Version']) and strcmp($conf['UserAdvManager_Version'], '2.20.0') < 0)
   {
     /* upgrade from branch 2.16 to 2.20 */
     /* ******************************** */
     upgrade_216_220();
+  }
+
+/* Check for upgrade from 2.20.3 to 2.20.4 */
+/* *************************************** */
+  if (isset($conf['UserAdvManager_Version']) and strcmp($conf['UserAdvManager_Version'], '2.20.4') < 0)
+  {
+    /* upgrade from branch 2.16 to 2.20 */
+    /* ******************************** */
+    upgrade_2203_2204();
   }