Projet

Général

Profil

Révision feca1e4a

Ajouté par Assos Assos il y a presque 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/webform/includes/webform.emails.inc
183 183
function webform_emails_form_status_save($form, &$form_state) {
184 184
  foreach ($form_state['values']['emails'] as $eid => $status) {
185 185
    db_update('webform_emails')->fields(array(
186
      'status' => $status['status']
186
      'status' => $status['status'],
187 187
    ))
188
    ->condition('eid', $eid)
189
    ->condition('nid', $form['#node']->nid)
190
    ->execute();
188
      ->condition('eid', $eid)
189
      ->condition('nid', $form['#node']->nid)
190
      ->execute();
191 191
  }
192 192

  
193 193
  // Refresh the entity cache, should it be cached in persistent storage.
......
223 223
        $title = t('E-mail to address');
224 224
        $description = t('Form submissions will be e-mailed to this address. Any email, select, or hidden form element may be selected as the recipient address. Multiple e-mail addresses may be separated by commas.');
225 225
        break;
226

  
226 227
      case 'subject':
227 228
        $default_value = webform_replace_tokens(webform_variable_get('webform_default_subject'), $node);
228 229
        $title = t('E-mail subject');
229 230
        $description = t('Any textfield, select, or hidden form element may be selected as the subject for e-mails.');
230 231
        break;
232

  
231 233
      case 'from_address':
232 234
        $default_value = webform_replace_tokens(webform_variable_get('webform_default_from_address'), $node);
233 235
        $title = t('E-mail from address');
234 236
        $description = t('Any email, select, or hidden form element may be selected as the sender\'s e-mail address.');
235 237
        break;
238

  
236 239
      case 'from_name':
237 240
        $default_value = webform_replace_tokens(webform_variable_get('webform_default_from_name'), $node);
238 241
        $title = t('E-mail from name');
......
262 265
    $component_options = webform_component_list($node, $field_type, FALSE);
263 266
    $form[$field . '_component'] = array(
264 267
      '#type' => 'select',
265
      '#default_value' =>  is_numeric($email[$field]) ? $email[$field] : NULL,
268
      '#default_value' => is_numeric($email[$field]) ? $email[$field] : NULL,
266 269
      '#options' => empty($component_options) ? array('' => t('No available components')) : $component_options,
267 270
      '#disabled' => empty($component_options) ? TRUE : FALSE,
268 271
      '#weight' => 6,
......
618 621
 * Form for deleting an e-mail setting.
619 622
 */
620 623
function webform_email_delete_form($form, $form_state, $node, $email) {
621
  $eid = $email['eid'];
622

  
623 624
  $form['node'] = array(
624 625
    '#type' => 'value',
625 626
    '#value' => $node,

Formats disponibles : Unified diff