non security modules update
This commit is contained in:
17
sites/all/modules/contrib/fields/email/email.diff.inc
Normal file
17
sites/all/modules/contrib/fields/email/email.diff.inc
Normal file
@@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Provide diff field functions for the Email module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Diff field callback for parsing email fields comparative values.
|
||||
*/
|
||||
function email_field_diff_view($items, $context) {
|
||||
$diff_items = array();
|
||||
foreach ($items as $delta => $item) {
|
||||
$diff_items[$delta] = $item['email'];
|
||||
}
|
||||
return $diff_items;
|
||||
}
|
||||
@@ -5,9 +5,9 @@ package = Fields
|
||||
|
||||
files[] = email.migrate.inc
|
||||
|
||||
; Information added by drupal.org packaging script on 2012-08-29
|
||||
version = "7.x-1.2"
|
||||
; Information added by Drupal.org packaging script on 2014-04-10
|
||||
version = "7.x-1.3"
|
||||
core = "7.x"
|
||||
project = "email"
|
||||
datestamp = "1346254131"
|
||||
datestamp = "1397134155"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ class MigrateEmailFieldHandler extends MigrateFieldHandler {
|
||||
$this->registerTypes(array('email'));
|
||||
}
|
||||
|
||||
public function prepare(stdClass $entity, array $field_info, array $instance, array $values) {
|
||||
public function prepare($entity, array $field_info, array $instance, array $values) {
|
||||
// Setup the Field API array for saving.
|
||||
$arguments = (isset($values['arguments'])) ? $values['arguments']: array();
|
||||
$language = $this->getFieldLanguage($entity, $field_info, $arguments);
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Module file for the email module, which creates a email address field.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_field_info().
|
||||
@@ -20,7 +24,10 @@ function email_field_info() {
|
||||
* Implements hook_migrate_api().
|
||||
*/
|
||||
function email_migrate_api() {
|
||||
return array('api' => 2);
|
||||
return array(
|
||||
'api' => 2,
|
||||
'field handlers' => array('MigrateEmailFieldHandler'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -198,7 +205,7 @@ function email_menu() {
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('email_admin_settings'),
|
||||
'access arguments' => array('administer site configuration'),
|
||||
'type' => MENU_CALLBACK,
|
||||
'type' => MENU_NORMAL_ITEM,
|
||||
);
|
||||
return $items;
|
||||
}
|
||||
@@ -433,7 +440,7 @@ function email_mail_page_form_submit($form, &$form_state) {
|
||||
|
||||
// Log the operation:
|
||||
flood_register_event('email');
|
||||
watchdog('mail', t('%name-from sent an e-mail at %form.', array('%name-from' => $form_state['values']['name'], '%form' => url($_GET['q'], array('absolute' => TRUE)))));
|
||||
watchdog('mail', '%name-from sent an e-mail at %form.', array('%name-from' => $form_state['values']['name'], '%form' => url($_GET['q'], array('absolute' => TRUE))));
|
||||
|
||||
drupal_set_message(t('Your message has been sent.'));
|
||||
$form_state['redirect'] = $path;
|
||||
@@ -447,7 +454,7 @@ function email_mail($key, &$message, $params) {
|
||||
switch ($key) {
|
||||
case 'contact':
|
||||
// Compose the body:
|
||||
$message['body'][] = t('@name sent a message using the contact form at @url.', array('@name' => $params['name'], '@url' => $params['url']), array('langcode' =>$language->language));
|
||||
$message['body'][] = t('@name sent a message using the contact form at @url.', array('@name' => $params['name'], '@url' => $params['url']), array('langcode' => $language->language));
|
||||
$message['body'][] = $params['message'];
|
||||
$message['subject'] = "";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user