Ignore:
Timestamp:
Feb 5, 2014, 5:57:48 PM (10 years ago)
Author:
Eric
Message:

Merge r27209 from trunk to branch 2.6:
Fix bug with UAM module in PWG_Stuff (thx to Gabeek for reporting)
Obsolete translation keys cleanup
Update el_GR, thanks to : bas_alba
Update pt_BR, thanks to : flaviove
Update lv_LV, thanks to : agrisans
Update it_IT, thanks to : Ericnet
Update de_DE, thanks to : Joergen
Update es_ES, thanks to : jpr928

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.6/admin/UAM_admin.php

    r26956 r27210  
    220220      array_push(
    221221        $page['infos'],
    222         sprintf(l10n('UAM_group "%s" updated'), $UAM_group['name'])
     222        sprintf(l10n('UAM_group %s updated'), $UAM_group['name'])
    223223      );
    224224    }
     
    787787// *************************************************************************
    788788  case 'userlist':
    789  
     789
    790790  $conf_UAM = unserialize($conf['UserAdvManager']);
    791  
     791
    792792  if (isset($conf_UAM['ADDLASTVISIT']) and $conf_UAM['ADDLASTVISIT']=='true')
    793793  {
     
    800800      die('Hacking attempt!');
    801801    }
    802          
     802
    803803    include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
    804804
     
    13701370                                .($local_user['id'] == $conf['default_user_id']
    13711371                                ? '<BR>['.l10n('default values').']' : ''),
    1372                                 'STATUS' => l10n('user_status_'
    1373                                 .$local_user['status']),
     1372          'STATUS'           => l10n('user_status_'.$local_user['status']),
    13741373          'EMAIL'            => $local_user['email'],
    13751374          'GROUPS'           => $groups_string,
Note: See TracChangeset for help on using the changeset viewer.