#93289 by webchick. Remove the first step from the new site todo list when it is done.

1 files changed, 15 insertions, 6 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index f2285391b..f80eb119a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2324,14 +2324,23 @@ function node_page_default() {
     $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
   }
   else {
-    $output = t('
+    // Check for existence of admin account.
+    $admin = db_result(db_query('SELECT uid FROM {users} WHERE uid = 1'));
+
+    $default_message = '
       <h1 class="title">Welcome to your new Drupal website!</h1>
       <p>Please follow these steps to set up and start using your website:</p>
-      <ol>
+      <ol>';
+
+    if (!$admin) {
+      $default_message .= '
         <li>
           <strong>Create your administrator account</strong>
           To begin, <a href="@register">create the first account</a>. This account will have full administration rights and will allow you to configure your website.
-        </li>
+        </li>';
+    }
+
+    $default_message .= '
         <li>
           <strong>Configure your website</strong>
           Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.
@@ -2349,9 +2358,9 @@ function node_page_default() {
           Finally, you can <a href="@content">create content</a> for your website. This message will disappear once you have published your first post.
         </li>
       </ol>
-      <p>For more information, please refer to the <a href="@help">help section</a>, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.</p>',
-      array('@drupal' => 'http://drupal.org/', '@register' => url('user/register'), '@admin' => url('admin'), '@config' => url('admin/settings'), '@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules', '@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes', '@content' => url('node/add'), '@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')
-    );
+      <p>For more information, please refer to the <a href="@help">help section</a>, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.</p>';
+
+    $output = t($default_message, array('@drupal' => 'http://drupal.org/', '@register' => url('user/register'), '@admin' => url('admin'), '@config' => url('admin/settings'), '@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules', '@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes', '@content' => url('node/add'), '@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support'));
     $output = '<div id="first-time">'. $output .'</div>';
   }
   drupal_set_title('');