Project

General

Profile

Revision 6e3ce7c2

Added by Assos Assos over 3 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ctools/plugins/contexts/user.inc
41 41 
  if ($conf) {
42 42 
    if ($data['type'] == 'current') {
43 43 
      global $user;
44 
      $data = user_load($user->uid);
45 44 
      if (user_is_logged_in()) {
45 
        $data = user_load($user->uid);
46 46 
        $data->logged_in_user = TRUE;
47 47 
      }
48 
      else {
49 
        $data = drupal_anonymous_user();
50 
      }
48 51 
    }
49 52 
    else {
50 53 
      $data = user_load($data['uid']);

Also available in: Unified diff