فهرست منبع

Fixed bug in importers with form validate callback

Stephen Ficklin 11 سال پیش
والد
کامیت
d9f974d9f6
3فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 2 1
      tripal_pub/includes/importers/AGL.inc
  2. 2 1
      tripal_pub/includes/importers/PMID.inc
  3. 1 1
      tripal_pub/includes/pub_importers.inc

+ 2 - 1
tripal_pub/includes/importers/AGL.inc

@@ -21,7 +21,7 @@ function tripal_pub_remote_alter_form_AGL($form, $form_state) {
 /**
  *
  */
-function tripal_pub_remote_validate_form_AGL(&$form, $form_state) {
+function tripal_pub_remote_validate_form_AGL($form, $form_state) {
   $days =  trim($form_state['values']["days"]);
   $num_criteria = $form['num_criteria']['#default_value'];
 
@@ -43,6 +43,7 @@ function tripal_pub_remote_validate_form_AGL(&$form, $form_state) {
       form_set_error("search_terms-$i", "Unfortuantely, the AGL importer can only support a single accession at a time. Please remove the others.");
     }
   }
+  return $form;
 }
 /**
  *

+ 2 - 1
tripal_pub/includes/importers/PMID.inc

@@ -23,7 +23,7 @@ function tripal_pub_remote_alter_form_PMID($form, $form_state) {
 /**
  *
  */
-function tripal_pub_remote_validate_form_PMID(&$form, $form_state) {
+function tripal_pub_remote_validate_form_PMID($form, $form_state) {
   $num_criteria = $form['num_criteria']['#default_value'];
 
   for ($i = 1; $i <= $num_criteria; $i++) {
@@ -33,6 +33,7 @@ function tripal_pub_remote_validate_form_PMID(&$form, $form_state) {
       form_set_error("search_terms-$i", "The PubMed accession must be a numeric value, prefixed with 'PMID:' (e.g. PMID:23024789).");
     }
   }
+  return $form;
 }
 /**
  *

+ 1 - 1
tripal_pub/includes/pub_importers.inc

@@ -467,7 +467,7 @@ function tripal_pub_importer_setup_form_validate($form, &$form_state) {
   }
   // allow the selected remote database to validate any changes to the form if needed
   $callback = "tripal_pub_remote_validate_form_$remote_db";
-  call_user_func($callback, $form, $form_state);
+  $form = call_user_func($callback, $form, $form_state);
 }
 
 /**