diff options
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search/search.admin.inc | 6 | ||||
| -rw-r--r-- | modules/search/search.api.php | 5 | ||||
| -rw-r--r-- | modules/search/search.module | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc index 4e8cece46..5e5ec4056 100644 --- a/modules/search/search.admin.inc +++ b/modules/search/search.admin.inc @@ -11,7 +11,7 @@ */ function search_reindex_confirm() { return confirm_form(array(), t('Are you sure you want to re-index the site?'), - 'admin/settings/search', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); + 'admin/config/search/settings', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); } /** @@ -21,7 +21,7 @@ function search_reindex_confirm_submit(&$form, &$form_state) { if ($form['confirm']) { search_reindex(); drupal_set_message(t('The index will be rebuilt.')); - $form_state['redirect'] = 'admin/settings/search'; + $form_state['redirect'] = 'admin/config/search/settings'; return; } } @@ -112,5 +112,5 @@ function search_admin_settings_submit($form, &$form_state) { */ function search_admin_reindex_submit($form, &$form_state) { // send the user to the confirmation page - $form_state['redirect'] = 'admin/settings/search/reindex'; + $form_state['redirect'] = 'admin/config/search/settings/reindex'; }
\ No newline at end of file diff --git a/modules/search/search.api.php b/modules/search/search.api.php index 03a0016d3..1e88f4884 100644 --- a/modules/search/search.api.php +++ b/modules/search/search.api.php @@ -35,7 +35,8 @@ * @param $op * A string defining which operation to perform: * - 'admin': The hook should return a form array containing any fieldsets the - * module wants to add to the Search settings page at admin/settings/search. + * module wants to add to the Search settings page at + * admin/config/search/settings. * - 'name': The hook should return a translated name defining the type of * items that are searched for with this module ('content', 'users', ...). * - 'reset': The search index is going to be rebuilt. Modules which use @@ -51,7 +52,7 @@ * @return * This varies depending on the operation. * - 'admin': The form array for the Search settings page at - * admin/settings/search. + * admin/config/search/settings. * - 'name': The translated string of 'Content'. * - 'reset': None. * - 'search': An array of search results. To use the default search result diff --git a/modules/search/search.module b/modules/search/search.module index 2038765f5..da30e3d55 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -97,10 +97,10 @@ function search_help($path, $arg) { switch ($path) { case 'admin/help#search': $output = '<p>' . t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site, and is useful for finding both users and posts.') . '</p>'; - $output .= '<p>' . t('To provide keyword searching, the search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the <a href="@searchsettings">search settings page</a>; for example, the <em>Number of items to index per cron run</em> sets the maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce this number to prevent timeouts and memory errors when indexing.', array('@cron' => url('admin/reports/status'), '@searchsettings' => url('admin/settings/search'))) . '</p>'; + $output .= '<p>' . t('To provide keyword searching, the search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the <a href="@searchsettings">search settings page</a>; for example, the <em>Number of items to index per cron run</em> sets the maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce this number to prevent timeouts and memory errors when indexing.', array('@cron' => url('admin/reports/status'), '@searchsettings' => url('admin/config/search/settings'))) . '</p>'; $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@search">Search module</a>.', array('@search' => 'http://drupal.org/handbook/modules/search/')) . '</p>'; return $output; - case 'admin/settings/search': + case 'admin/config/search/settings': return '<p>' . t('The search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured <a href="@cron">cron maintenance task</a> is required. Indexing behavior can be adjusted using the settings below.', array('@cron' => url('admin/reports/status'))) . '</p>'; case 'search#noresults': return t('<ul> @@ -192,7 +192,7 @@ function search_menu() { 'type' => MENU_SUGGESTED_ITEM, 'file' => 'search.pages.inc', ); - $items['admin/settings/search'] = array( + $items['admin/config/search/settings'] = array( 'title' => 'Search settings', 'description' => 'Configure relevance settings for search and other indexing options', 'page callback' => 'drupal_get_form', @@ -201,7 +201,7 @@ function search_menu() { 'type' => MENU_NORMAL_ITEM, 'file' => 'search.admin.inc', ); - $items['admin/settings/search/reindex'] = array( + $items['admin/config/search/settings/reindex'] = array( 'title' => 'Clear index', 'page callback' => 'drupal_get_form', 'page arguments' => array('search_reindex_confirm'), |