Changeset 232

Show
Ignore:
Timestamp:
02/17/09 12:32:38 (19 months ago)
Author:
frans
Message:

merging r231 into trunk; fixed #586

Location:
trunk/sites/all/modules/smsframework/modules/sms_user
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/sites/all/modules/smsframework/modules/sms_user

    • Property svn:mergeinfo set to
      /branches/kester/current/sites/all/modules/smsframework/modules/sms_user:135-183,193-204,226-231
      /external/current/sites/all/modules/messaging/smsframework/modules/sms_user:130
      /external/current/sites/all/modules/smsframework/modules/sms_user:129,177,194-195

  • trunk/sites/all/modules/smsframework/modules/sms_user/sms_user.module

    r225 r232  
    5555        'callback' => 'sms_user_settings', 
    5656        'callback arguments' => array('sms_user_form'), 
    57         'access' => user_access('administer users') || $user->uid == arg(1), 
     57        'access' => user_access('administer users') || (user_access('receive sms message') && $user->uid == arg(1)), 
    5858        'type' => MENU_LOCAL_TASK, 
    5959      );