- Patch #104763 by RobRoy: better defaults for page and story.

3 files changed, 55 insertions, 4 deletions

diff --git a/install.php b/install.php
index b461cb014..e059890b6 100644
--- a/install.php
+++ b/install.php
@@ -541,7 +541,12 @@ function install_complete($profile) {
   $function = $profile .'_profile_final';
   if (function_exists($function)) {
     // More steps required
-    $output .= $function();
+    $profile_message = $function();
+  }
+
+  // If the profile returned a welcome message, use that instead of default.
+  if (isset($profile_message)) {
+    $output .= $profile_message;
   }
   else {
     // No more steps
diff --git a/modules/system/system.install b/modules/system/system.install
index ce9886ed7..17bd77383 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1088,8 +1088,6 @@ function system_install() {
 
   db_query("INSERT INTO {node_access} VALUES (0, 0, 'all', 1, 0, 0)");
 
-  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('page', 'Page', 'node', 'If you want to add a static page, like a contact page or an about page, use a page.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'page')");
-  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('story', 'Story', 'node', 'Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'story')");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Filtered HTML',',1,2,',1)");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('PHP code','',0)");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Full HTML','',1)");
diff --git a/profiles/default/default.profile b/profiles/default/default.profile
index f62b01aa5..cb9cfdd90 100644
--- a/profiles/default/default.profile
+++ b/profiles/default/default.profile
@@ -12,7 +12,10 @@ function default_profile_modules() {
 }
 
 /**
- * Return a description of the profile.
+ * Return a description of the profile for the initial installation screen.
+ *
+ * @return
+ *   An array with keys 'name' and 'description' describing this profile.
  */
 function default_profile_details() {
   return array(
@@ -20,3 +23,48 @@ function default_profile_details() {
     'description' => 'Select this profile to enable some basic Drupal functionality and the default theme.'
   );
 }
+
+/**
+ * Perform any final installation tasks for this profile.
+ *
+ * @return
+ *   An optional HTML string to display to the user on the final installation
+ *   screen.
+ */
+function default_profile_final() {
+  // Insert default user-defined node types into the database.
+  $types = array(
+    array(
+      'type' => 'page',
+      'name' => t('Page'),
+      'module' => 'node',
+      'description' => t('If you want to add a static page, like a contact page or an about page, use a page.'),
+      'custom' => TRUE,
+      'modified' => TRUE,
+      'locked' => FALSE,
+    ),
+    array(
+      'type' => 'story',
+      'name' => t('Story'),
+      'module' => 'node',
+      'description' => t('Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.'),
+      'custom' => TRUE,
+      'modified' => TRUE,
+      'locked' => FALSE,
+    ),
+  );
+
+  foreach ($types as $type) {
+    $type = (object) _node_type_set_defaults($type);
+    node_type_save($type);
+  }
+
+  // Default page to not be promoted and have comments disabled.
+  variable_set('node_options_page', array('status'));
+  variable_set('comment_page', COMMENT_NODE_DISABLED);
+
+  // Don't display date and author information for page nodes by default.
+  $theme_settings = variable_get('theme_settings', array());
+  $theme_settings['toggle_node_info_page'] = FALSE;
+  variable_set('theme_settings', $theme_settings);
+}
\ No newline at end of file