Changeset 9154


Ignore:
Timestamp:
Feb 10, 2011, 6:18:57 PM (9 years ago)
Author:
Eric
Message:

Bug 2186 merged from trunk to branch 2.20

Location:
extensions/NBC_UserAdvManager/branches/2.20
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php

    r9136 r9154  
    123123    $_POST['UAM_CustomPasswRetr_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomPasswRetr_Text'])));
    124124
    125     //Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
     125    // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
    126126    if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
    127127    {
     
    551551                }
    552552
     553    // Avoid jquery accordeon menu bug when there is no users to display
     554    if (empty($visible_user_list))
     555    {
     556      $visible_user_list[] = null;
     557    }
     558
    553559                foreach ($visible_user_list as $local_user)
    554560    {
     
    10221028                }
    10231029
     1030    // Avoid jquery accordeon menu bug when there is no users to display
     1031    if (empty($visible_user_list))
     1032    {
     1033      $visible_user_list[] = null;
     1034    }
     1035
    10241036                foreach ($visible_user_list as $local_user)
    10251037    {
     
    14221434                }
    14231435
    1424       //Plugin version inserted
    1425       $template->assign(
    1426         array(
    1427           'UAM_VERSION'  => $version,
    1428           'UAM_PATH'     => UAM_PATH,
    1429         )
    1430       );
    1431 
     1436    // Avoid jquery accordeon menu bug when there is no users to display
     1437    if (empty($visible_user_list))
     1438    {
     1439      $visible_user_list[] = null;
     1440    }
     1441   
    14321442                foreach ($visible_user_list as $local_user)
    14331443    {
     
    14651475                }
    14661476
     1477    //Plugin version inserted
     1478    $template->assign(
     1479      array(
     1480        'UAM_VERSION'  => $version,
     1481        'UAM_PATH'     => UAM_PATH,
     1482      )
     1483    );
     1484
    14671485// +-----------------------------------------------------------------------+
    14681486// |                             errors display                            |
  • extensions/NBC_UserAdvManager/branches/2.20/changelog.txt.php

    r9136 r9154  
    226226            Bug 2072 fixed - Remove sort on "difference in days" in user tracking tab
    227227            Bug 2140 fixed - English sentence corrections
    228             Bug
     228            Bug 2186 fixed - JQuery accordeon menu when no users are listed in UAM tables
    229229
    230230*/
  • extensions/NBC_UserAdvManager/branches/2.20/main.inc.php

    r9136 r9154  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.16.0
     4Version: 2.20.0a
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
Note: See TracChangeset for help on using the changeset viewer.