Changeset 9154 for extensions/NBC_UserAdvManager/branches/2.20/admin

Timestamp:

Feb 10, 2011, 6:18:57 PM (14 years ago)

Author:

Eric

Message:

Bug 2186 merged from trunk to branch 2.20

File:

• extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php (modified) (5 diffs)

extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php

@@ -123 +123 @@
     $_POST['UAM_CustomPasswRetr_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomPasswRetr_Text'])));
 
-    //Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
+    // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
     if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
     {
@@ -551 +551 @@
                 }
 
+    // Avoid jquery accordeon menu bug when there is no users to display
+    if (empty($visible_user_list))
+    {
+      $visible_user_list[] = null;
+    }
+
                 foreach ($visible_user_list as $local_user)
     {
@@ -1022 +1028 @@
                 }
 
+    // Avoid jquery accordeon menu bug when there is no users to display
+    if (empty($visible_user_list))
+    {
+      $visible_user_list[] = null;
+    }
+
                 foreach ($visible_user_list as $local_user)
     {
@@ -1422 +1434 @@
                 }
 
-      //Plugin version inserted
-      $template->assign(
-        array(
-          'UAM_VERSION'  => $version,
-          'UAM_PATH'     => UAM_PATH,
-        )
-      );
-
+    // Avoid jquery accordeon menu bug when there is no users to display
+    if (empty($visible_user_list))
+    {
+      $visible_user_list[] = null;
+    }
+    
                 foreach ($visible_user_list as $local_user)
     {
@@ -1465 +1475 @@
                 }
 
+    //Plugin version inserted
+    $template->assign(
+      array(
+        'UAM_VERSION'  => $version,
+        'UAM_PATH'     => UAM_PATH,
+      )
+    );
+
 // +-----------------------------------------------------------------------+
 // |                             errors display                            |