Permalink
Browse files

Merge branch 'master' of github.com:pounard/yamm

  • Loading branch information...
2 parents 618bece + da4c238 commit 0c54bca8a2e024dd8b89746b65a1d2fa6d4bb0c5 @pounard committed Aug 25, 2010
@@ -31,7 +31,7 @@ public function form() {
'#title' => t('Duplicates handling'),
'#options' => $options,
'#description' => t('Define what behavior the the entity should adopt when vocabulary name conflicts with an existing one. Beware, if more than one duplicate is found, the algorithm won\'t merge but will create a new one instead.'),
- '#default_value' => $this->get('duplicate_behavior', Yamm_EntityVocabularySettings::DUPLICATE_IGNORE),
+ '#default_value' => $this->get('duplicate_behavior', Yamm_Entity_VocabularySettings::DUPLICATE_IGNORE),
);
return $form;
View
@@ -184,6 +184,9 @@ function yamm_api_get_entities() {
$arg = array('@type' => $type, '@module' => $module);
watchdog('yamm_api', $msg, $arg, WATCHDOG_ERROR);
continue;
+ }
+ else {
+ $base_tables[$definition['base_table']] = TRUE;
}
$definition['module'] = $module;
Oops, something went wrong.

0 comments on commit 0c54bca

Please sign in to comment.