Changeset 20704

Timestamp:

Feb 11, 2013, 10:04:26 PM (12 years ago)

Author:

Eric

Message:

r20703 merged from trunk to branch 2.41

Location:

extensions/UserAdvManager/branches/2.41

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• language/tr_TR (added)
• language/tr_TR/plugin.lang.php (added)

extensions/UserAdvManager/branches/2.41/changelog.txt.php

@@ -373 +373 @@
             Update tr_TR, thanks to : hakanselcuk and LazBoy
 
+-- 2.41.5 : Bug 2842 fixed - Previews bug 2829 fix did affect the normal registration confirmation.
+            Update tr_TR, thanks to : hakanselcuk
+
 */
 ?>

extensions/UserAdvManager/branches/2.41/include/functions.inc.php

@@ -139 +139 @@
     // No validation needed when admins add users - users are considered as valid by default
     // -------------------------------------------------------------------------------------
-    if (isset($page['page']) and ($page['page'] != 'user_list'))
-    {
+    //Bug 2829 fix not working - if (isset($page['page']) and ($page['page'] != 'user_list'))
+    //{
       if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
       {
@@ -172 +172 @@
         }
       }
-    }
+    //}
   }
 }