$result=db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 ORDER BY b.weight, n.title'));
@@ -1060,6 +1060,7 @@ function theme_forum_topic_navigation($node) {
$sql="SELECT n.nid, n.title, n.sticky, l.comment_count, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum' ORDER BY n.sticky DESC, "._forum_get_topic_order_sql(variable_get('forum_order',1));
@@ -243,7 +243,7 @@ function search_admin_settings() {
* Menu callback: confirm wiping of the index.
*/
functionsearch_wipe_confirm(){
returnconfirm_form('search_wipe_confirm',$form,t('Are you sure you want to re-index the site?'),
returnconfirm_form('search_wipe_confirm',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'));
// And proceed with normal login, going to user page.
$edit=array();
user_module_invoke('login',$edit,$user);
drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
drupal_goto('user/'.$user->uid.'/edit');
...
...
@@ -1153,7 +1154,10 @@ function user_register() {
// Redirect back to page which initiated the create request; usually admin/user/user/create