3 files changed, 8 insertions, 3 deletions
diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc
index afa02defb..d93c85288 100644
--- a/modules/search/search.admin.inc
+++ b/modules/search/search.admin.inc
@@ -143,7 +143,7 @@ function search_admin_settings($form) {
  */
 function search_admin_settings_validate($form, &$form_state) {
   // Check whether we selected a valid default.
-  if ($form_state['clicked_button']['#value'] != t('Reset to defaults')) {
+  if ($form_state['triggering_element']['#value'] != t('Reset to defaults')) {
     $new_modules = array_filter($form_state['values']['search_active_modules']);
     $default = $form_state['values']['search_default_module'];
     if (!in_array($default, $new_modules, TRUE)) {
@@ -164,7 +164,7 @@ function search_admin_settings_submit($form, &$form_state) {
   }
   $current_modules = variable_get('search_active_modules', array('node', 'user'));
   // Check whether we are resetting the values.
-  if ($form_state['clicked_button']['#value'] == t('Reset to defaults')) {
+  if ($form_state['triggering_element']['#value'] == t('Reset to defaults')) {
     $new_modules = array('node', 'user');
   }
   else {
diff --git a/modules/search/search.api.php b/modules/search/search.api.php
index 557a56e51..8d6e2399f 100644
--- a/modules/search/search.api.php
+++ b/modules/search/search.api.php
@@ -107,6 +107,10 @@ function hook_search_reset() {
 /**
  * Report the status of indexing.
  *
+ * The core search module only invokes this hook on active modules.
+ * Implementing modules do not need to check whether they are active when
+ * calculating their return values.
+ *
  * @return
  *  An associative array with the key-value pairs:
  *  - 'remaining': The number of items left to index.
diff --git a/modules/search/tests/search_embedded_form.module b/modules/search/tests/search_embedded_form.module
index c0058f74d..484579674 100644
--- a/modules/search/tests/search_embedded_form.module
+++ b/modules/search/tests/search_embedded_form.module
@@ -65,5 +65,6 @@ function search_embedded_form_form_submit($form, &$form_state) {
  * Adds the test form to search results.
  */
 function search_embedded_form_preprocess_search_result(&$variables) {
-  $variables['snippet'] .= drupal_render(drupal_get_form('search_embedded_form_form'));
+  $form = drupal_get_form('search_embedded_form_form');
+  $variables['snippet'] .= drupal_render($form);
 }