? modules/1
? modules/nodeaccess.1
? modules/nodeaccess.module
Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.175
diff -u -F^f -r1.175 database.mysql
--- database/database.mysql	8 Apr 2005 14:59:14 -0000	1.175
+++ database/database.mysql	11 Apr 2005 22:13:14 -0000
@@ -818,3 +818,7 @@
 INSERT INTO variable (name,value) VALUES ('filter_html_1','i:1;');
 
 INSERT INTO locales_meta (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');
+
+INSERT INTO node VALUES (1,'story','Welcome!',0,1,unix_timestamp(),0,0,1,0,'','<?php\r\nreturn t(\"<p>Welcome to your new <a href=\\\"%drupal\\\">Drupal</a>-powered website. This message will guide you through your first steps with Drupal, and will disappear once you have posted your first piece of content.</p>\r\n      <p>The first thing you will need to do is <a href=\\\"%register\\\">create the first account</a>. This account will have full administration rights and will allow you to configure your website. Once logged in, you can visit the <a href=\\\"%admin\\\">administration section</a> and <a href=\\\"%config\\\">set up your site\'s configuration</a>.</p>\r\n      <p>Drupal comes with various modules, each of which contains a specific piece of functionality. You should visit the <a href=\\\"%modules\\\">module list</a> and enable those modules which suit your website\'s needs.</p>\r\n      <p><a href=\\\"%themes\\\">Themes</a> handle the presentation of your website. You can use one of the existing themes, modify them or create your own from scratch.</p>\r\n      <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\\\"%handbook\\\">Drupal handbook online</a>.</p>\", array(\'%drupal\' => \'http://www.drupal.org/\', \'%register\' => url(\'user/register\'), \'%admin\' => url(\'admin\'), \'%config\' => url(\'admin\'), \'%modules\' => url(\'admin/modules\'), \'%themes\' => url(\'admin/themes\'), \'%handbook\' => \'http://www.drupal.org/handbook\'));\r\n?>','',0,2);
+UPDATE node SET teaser = body, changed = created WHERE nid=1;
+INSERT INTO sequences (name, id) VALUES ('node_nid', 1);
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.111
diff -u -F^f -r1.111 database.pgsql
--- database/database.pgsql	8 Apr 2005 14:59:14 -0000	1.111
+++ database/database.pgsql	11 Apr 2005 22:13:16 -0000
@@ -816,11 +816,14 @@
 
 INSERT INTO locales_meta(locale, name, enabled, isdefault) VALUES('en', 'English', '1', '1');
 
+INSERT INTO node VALUES (1,'story','Welcome!',0,1,extract(epoch from now())::integer,0,0,1,0,'','<?php\r\nreturn t(\"<p>Welcome to your new <a href=\\\"%drupal\\\">Drupal</a>-powered website. This message will guide you through your first steps with Drupal, and will disappear once you have posted your first piece of content.</p>\r\n      <p>The first thing you will need to do is <a href=\\\"%register\\\">create the first account</a>. This account will have full administration rights and will allow you to configure your website. Once logged in, you can visit the <a href=\\\"%admin\\\">administration section</a> and <a href=\\\"%config\\\">set up your site\'s configuration</a>.</p>\r\n      <p>Drupal comes with various modules, each of which contains a specific piece of functionality. You should visit the <a href=\\\"%modules\\\">module list</a> and enable those modules which suit your website\'s needs.</p>\r\n      <p><a href=\\\"%themes\\\">Themes</a> handle the presentation of your website. You can use one of the existing themes, modify them or create your own from scratch.</p>\r\n      <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\\\"%handbook\\\">Drupal handbook online</a>.</p>\", array(\'%drupal\' => \'http://www.drupal.org/\', \'%register\' => url(\'user/register\'), \'%admin\' => url(\'admin\'), \'%config\' => url(\'admin\'), \'%modules\' => url(\'admin/modules\'), \'%themes\' => url(\'admin/themes\'), \'%handbook\' => \'http://www.drupal.org/handbook\'));\r\n?>','',0,2);
+UPDATE node SET teaser = body, changed = created WHERE nid = 1;
+
 ---
 --- Alter some sequences
 ---
 ALTER SEQUENCE menu_mid_seq RESTART 2;
-
+ALTER SEQUENCE node_nid_seq RESTART 2;
 
 ---
 --- Functions
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.103
diff -u -F^f -r1.103 updates.inc
--- database/updates.inc	8 Apr 2005 14:59:14 -0000	1.103
+++ database/updates.inc	11 Apr 2005 22:13:18 -0000
@@ -2327,17 +2327,6 @@ function update_127() {
   return $ret;
 }
 
-function update_sql($sql) {
-  $edit = $_POST["edit"];
-  $result = db_query($sql);
-  if ($result) {
-    return array('1', nl2br(htmlentities($sql)) ." ", "<div style=\"color: green;\">OK</div>\n");
-  }
-  else {
-    return array('0', nl2br(htmlentities($sql)) ." ", "<div style=\"color: red;\">FAILED</div>\n");
-  }
-}
-
 function update_128() {
   $ret = array();
 
@@ -2351,6 +2340,19 @@ function update_128() {
   return $ret;
 }
 
+<<<<<<< updates.inc
+function update_sql($sql) {
+  $edit = $_POST["edit"];
+  $result = db_query($sql);
+  if ($result) {
+    return array('1', nl2br(htmlentities($sql)) ." ", "<div style=\"color: green;\">OK</div>\n");
+  }
+  else {
+    return array('0', nl2br(htmlentities($sql)) ." ", "<div style=\"color: red;\">FAILED</div>\n");
+  }
+}
+
+=======
 function update_129() {
   $ret = array();
 
@@ -2364,4 +2366,5 @@ function update_129() {
   return $ret;
 }
 
+>>>>>>> 1.103
 ?>
Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.162
diff -u -F^f -r1.162 block.module
--- modules/block.module	4 Apr 2005 12:27:05 -0000	1.162
+++ modules/block.module	11 Apr 2005 22:13:19 -0000
@@ -312,12 +312,13 @@ function block_box_add() {
 
   switch ($op) {
     case t('Save block'):
-      block_box_save($edit);
-      drupal_set_message(t('The new block has been added.'));
-      drupal_goto('admin/block');
-
+      if (block_box_save($edit)) {
+        drupal_set_message(t('The new block has been added.'));
+        drupal_goto('admin/block');
+      }
+      // deliberate no break
     default:
-      $form = block_box_form();
+      $form = block_box_form($edit);
       $form .= form_submit(t('Save block'));
       $output .= form($form);
   }
@@ -368,8 +369,13 @@ function block_box_save($edit, $delta = 
     db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $delta);
   }
   else {
+    if (empty($edit['info']) || db_num_rows(db_query("SELECT info FROM {boxes} WHERE info='%s'", $edit['info']))) {
+      form_set_error('title', t('You must enter unique data into the block description field.'));
+      return false;
+    }
     db_query("INSERT INTO {boxes} (title, body, info, format) VALUES  ('%s', '%s', '%s', %d)", $edit['title'], $edit['body'], $edit['info'], $edit['format']);
   }
+  return true;
 }
 
 /**
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.485
diff -u -F^f -r1.485 node.module
--- modules/node.module	5 Apr 2005 07:25:11 -0000	1.485
+++ modules/node.module	11 Apr 2005 22:13:21 -0000
@@ -1634,12 +1634,7 @@ function node_page_default() {
     $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
   }
   else {
-    $output = t("
-      <p>Welcome to your new <a href=\"%drupal\">Drupal</a>-powered website. This message will guide you through your first steps with Drupal, and will disappear once you have posted your first piece of content.</p>
-      <p>The first thing you will need to do is <a href=\"%register\">create the first account</a>. This account will have full administration rights and will allow you to configure your website. Once logged in, you can visit the <a href=\"%admin\">administration section</a> and <a href=\"%config\">set up your site's configuration</a>.</p>
-      <p>Drupal comes with various modules, each of which contains a specific piece of functionality. You should visit the <a href=\"%modules\">module list</a> and enable those modules which suit your website's needs.</p>
-      <p><a href=\"%themes\">Themes</a> handle the presentation of your website. You can use one of the existing themes, modify them or create your own from scratch.</p>
-      <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\"%handbook\">Drupal handbook online</a>.</p>", array('%drupal' => 'http://www.drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin'), '%modules' => url('admin/modules'), '%themes' => url('admin/themes'), '%handbook' => 'http://www.drupal.org/handbook'));
+    $output = t('There are no items found');
   }
 
   return $output;
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.454
diff -u -F^f -r1.454 user.module
--- modules/user.module	1 Apr 2005 15:55:02 -0000	1.454
+++ modules/user.module	11 Apr 2005 22:13:22 -0000
@@ -89,6 +89,7 @@ function user_load($array = array()) {
  *
  * @param $array
  *   An array of fields and values to save. For example array('name' => 'My name');
+ *   Setting a field to null deletes it from the data column.
  *
  * @param $category
  *   (optional) The category for storing profile information in.
@@ -114,7 +115,6 @@ function user_save($account, $array = ar
         else if ($key != 'roles') {
           // Roles is a special case: it used below.
           if ($value === null) {
-            // Setting a field to null deletes it from the data column.
             unset($data[$key]);
           }
           else {
