Commit 21b01b8b authored by Fabian Sörqvist's avatar Fabian Sörqvist
Browse files

Issue #1412340 by fabsor: Fixed Contributor reference fields are created even... 

Issue #1412340 by fabsor: Fixed Contributor reference fields are created even if the contributor feature is disabled.
parent 72d90a49

features/ns_article/ns_article.module

+1 −2
Changes for features/ns_article/ns_article.module: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -36,12 +36,11 @@ function ns_article_node_presave($node) { 
 */

function ns_article_defaultconfig_optionals() {

  $optionals = array();

  if (module_exists('ns_contributor')) {

  $optionals['field_default_fields']['node-ns_article-field_ns_article_byline'] = array(

    'title' => t('Article bylines'),

    'description' => t('Attach contributors to articles as bylines.'),

    'default' => FALSE,

    'applicable' => module_exists('ns_contributor'),

  );

  }

  return $optionals;

}

features/ns_blog/ns_blog.module

+3 −4
Changes for features/ns_blog/ns_blog.module: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -11,17 +11,16 @@ include_once('ns_blog.features.inc'); 
 */

function ns_blog_defaultconfig_optionals() {

  $optionals = array();

  if (module_exists('ns_contributor')) {

  $applicable = array('applicable' => module_exists('ns_contributor'));

  $optionals['field_default_fields']['node-ns_blog_post-field_ns_blog_post_blogger'] = array(

    'title' => t('Blog post contributors'),

    'description' => t('Attach contributors to blog posts as bloggers.'),

    'default' => FALSE,

    );

  ) + $applicable;

  $optionals['field_default_fields']['node-ns_blog-field_ns_blog_blogger'] = array(

    'title' => t('Blog contributors'),

    'description' => t('Attach contributors to a particular blog'),

    'default' => FALSE,

    );

  }

  ) + $applicable;

  return $optionals;

}
 
 No newline at end of file

features/ns_media/ns_media.module

+3 −4
Changes for features/ns_media/ns_media.module: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -21,17 +21,16 @@ function ns_media_preprocess_file_entity(&$variables) { 
 */

function ns_media_defaultconfig_optionals() {

  $optionals = array();

  if (module_exists('ns_contributor')) {

  $applicable = array('applicable' => module_exists('ns_contributor'));

  $optionals['field_default_fields']['file-image-field_ns_media_credit'] = array(

    'title' => t('Image credit'),

    'description' => t('Attach contributors to images.'),

    'default' => FALSE,

    );

  ) + $applicable;

  $optionals['field_default_fields']['file-video-field_ns_media_credit'] = array(

    'title' => t('Video credit'),

    'description' => t('Attach contributors to videos.'),

    'default' => FALSE,

    );

  }

  ) + $applicable;

  return $optionals;

}
 
 No newline at end of file

features/ns_page/ns_page.module

+1 −2
Changes for features/ns_page/ns_page.module: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,13 +11,12 @@ include_once('ns_page.features.inc'); 
 */

function ns_page_defaultconfig_optionals() {

  $optionals = array();

  if (module_exists('ns_contributor')) {

  $optionals['field_default_fields']['node-ns_page-field_ns_page_byline'] = array(

    'title' => t('Page contributors'),

    'description' => t('Attach contributors to pages.'),

    'default' => FALSE,

    'applicable' => module_exists('ns_contributor'),

  );

  }

  $optionals['field_default_fields']['node-ns_page-field_ns_page_link_list'] = array(

    'title' => t('Page link lists'),

    'description' => t('Add links to pages.'),