Commit 9a46d1ff authored by Antonio Savorelli's avatar Antonio Savorelli
Browse files

Updated to depend on "configure" module.

Showing with 13 additions and 9 deletions
+13 -9
......@@ -3,7 +3,11 @@
* @file
* Variable declarations for Easy Newsletters.
*/
function easynews_config_variable_info() {
/**
* Implements hook_configure_variable_info().
*/
function easynews_configure_variable_info() {
$variables = array(
'easynews_newsletter_footer' => array(
'group' => 'settings',
......@@ -49,9 +53,9 @@ function easynews_config_variable_info() {
}
/**
* Implements hook_config_variable_defaults().
* Implements hook_configure_variable_defaults().
*/
function easynews_config_variable_defaults() {
function easynews_configure_variable_defaults() {
return array(
'easynews_newsletter_enable' => TRUE,
);
......
name = Easy Newsletters
description = Sends node-based newsletters.
dependencies[] = config
dependencies[] = configure
dependencies[] = entityreference
dependencies[] = date
dependencies[] = image
......
......@@ -34,7 +34,7 @@ function easynews_menu() {
'access callback' => 'user_access',
'access arguments' => array('administer easynews'),
'page callback' => 'drupal_get_form',
'page arguments' => array('config_settings_form', 'easynews', 'settings'),
'page arguments' => array('configure_settings_form', 'easynews', 'settings'),
);
$items['admin/config/system/easynews/settings'] = array(
......@@ -50,7 +50,7 @@ function easynews_menu() {
'access callback' => 'user_access',
'access arguments' => array('administer easynews'),
'page callback' => 'drupal_get_form',
'page arguments' => array('config_settings_form', 'easynews', 'newsletter', t('!newsletter_name settings', array('!newsletter_name' => $group_info['admin name'])), array('list_key' => $key)),
'page arguments' => array('configure_settings_form', 'easynews', 'newsletter', t('!newsletter_name settings', array('!newsletter_name' => $group_info['admin name'])), array('list_key' => $key)),
);
}
......@@ -293,10 +293,10 @@ function easynews_form_alter(&$form, &$form_state, $form_id) {
unset($form['easynews_email_sent'], $form['easynews_email_sent_date'], $form['easynews_recipient_reference']);
break;
case 'config_settings_form' :
case 'configure_settings_form' :
$args = $form_state['build_info']['args'];
if ( $args[0] == 'easynews' && $args[1] == 'newsletter' ) {
$form['#submit'][] = 'easynews_config_file_save';
$form['#submit'][] = 'easynews_configure_file_save';
}
break;
}
......@@ -305,7 +305,7 @@ function easynews_form_alter(&$form, &$form_state, $form_id) {
/**
* Save header-image file as permanent.
*/
function easynews_config_file_save($form, &$form_state) {
function easynews_configure_file_save($form, &$form_state) {
$args = $form_state['build_info']['args'];
$group = $args[3]['list_key'];
// Hack to produce a (most likely) unique number given a string
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment