Projet

Général

Profil

Révision c22e192e

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ctools/plugins/contexts/user_edit_form.inc
107 107
  );
108 108

  
109 109
  if (!empty($conf['uid'])) {
110
    $info = db_query('SELECT * FROM {user} WHERE uid = :uid', array(':uid' => $conf['uid']))->fetchObject();
110
    $info = db_query('SELECT * FROM {users} WHERE uid = :uid', array(':uid' => $conf['uid']))->fetchObject();
111 111
    if ($info) {
112 112
      $link = l(t("'%name' [user id %uid]", array('%name' => $info->name, '%uid' => $info->uid)), "user/$info->uid", array('attributes' => array('target' => '_blank', 'title' => t('Open in new window')), 'html' => TRUE));
113 113
      $form['user']['#description'] = t('Currently set to !link', array('!link' => $link));
......
154 154
    $uid = $preg_matches[1];
155 155
  }
156 156
  if (is_numeric($uid)) {
157
    $user = db_query('SELECT uid FROM {user} WHEREuid = :uid', array(':uid' => $uid))->fetchObject();
157
    $user = db_query('SELECT uid FROM {users} WHERE uid = :uid', array(':uid' => $uid))->fetchObject();
158 158
  }
159 159
  else {
160
    $user = db_query('SELECT uid FROM {user} WHERE LOWER(name) = LOWER(:name)', array(':name' => $uid))->fetchObject();
160
    $user = db_query('SELECT uid FROM {users} WHERE LOWER(name) = LOWER(:name)', array(':name' => $uid))->fetchObject();
161 161
  }
162 162

  
163 163
  form_set_value($form['uid'], $user->uid, $form_state);

Formats disponibles : Unified diff