diff -Nuar front-5.x-1.9/front_page.info front-6.x/front_page.info --- front-5.x-1.9/front_page.info 2007-07-06 12:15:05.000000000 +0200 +++ front-6.x/front_page.info 2007-09-09 19:43:50.000000000 +0200 @@ -12,3 +12,5 @@ project = "front" datestamp = "1183716905" +core = 6.x + diff -Nuar front-5.x-1.9/front_page.module front-6.x/front_page.module --- front-5.x-1.9/front_page.module 2007-07-06 12:06:52.000000000 +0200 +++ front-6.x/front_page.module 2007-09-09 22:34:24.000000000 +0200 @@ -19,8 +19,8 @@ * Implementation of hook_help(). * */ -function front_page_help($section) { - switch ($section) { +function front_page_help($path, $arg) { + switch ($path) { case 'admin/settings/front': $roles = user_roles(); $special_note = ''; @@ -39,22 +39,21 @@ * this function sets the necessary paths etc. so drupal * knows where to find the front_page */ -function front_page_menu($may_cache) { +function front_page_menu() { $items = array(); - if ($may_cache) { - $items[] = array('path' => 'admin/settings/front', - 'title' => t('Advanced front page settings'), - 'description' => t('Specify a unique layout or splash page based on role type - override your HOME and breadcrumb links - display a custom mission style notice for users who haven\'t visited in a while - disable site and display a \'temporarily offline\' message.'), - 'callback' => 'drupal_get_form', - 'callback arguments' => 'front_page_admin', - 'access' => user_access('administer menu')); - $items[] = array( - 'path' => 'front_page', - 'title' => t(''), - 'callback' => 'front_page', - 'access' => TRUE, - 'type' => MENU_SUGGESTED_ITEM); - } + $items['admin/settings/front'] = array( + 'title' => 'Advanced front page settings', + 'description' => 'Specify a unique layout or splash page based on role type - override your HOME and breadcrumb links - display a custom mission style notice for users who haven\'t visited in a while - disable site and display a \'temporarily offline\' message.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('front_page_admin'), + 'access arguments' => array('administer menu'), + ); + $items['front_page'] = array( + 'title' => '', + 'page callback' => 'front_page', + 'access arguments' => array('access content'), + 'type' => MENU_SUGGESTED_ITEM, + ); return $items; } /** @@ -228,7 +227,7 @@ '#default_value' => variable_get('front_page_breadcrumb_redirect', ''), '#cols' => 20, '#rows' => 1, '#description' => t('Specify where the user should be redirected to. An example would be node/12. Leave blank when you\'re not using HOME redirect.'), - '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=') + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') ); $form['site'] = array( @@ -244,7 +243,7 @@ '#default_value' => variable_get('site_frontpage', 'node'), '#size' => 40, '#description' => t('Change this setting to front_page to activate your front page settings.'), - '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=') + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') );