Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.683
diff -u -p -r1.683 comment.module
--- modules/comment/comment.module	21 Jan 2009 16:58:41 -0000	1.683
+++ modules/comment/comment.module	21 Jan 2009 21:14:15 -0000
@@ -699,7 +699,7 @@ function comment_nodeapi_rss_item($node)
 /**
  * Implementation of hook_user_cancel().
  */
-function comment_user_cancel(&$edit, &$account, $method) {
+function comment_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_block_unpublish':
       db_update('comment')->fields(array('status' => 0))->condition('uid', $account->uid)->execute();
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.33
diff -u -p -r1.33 dblog.module
--- modules/dblog/dblog.module	21 Jan 2009 14:22:31 -0000	1.33
+++ modules/dblog/dblog.module	21 Jan 2009 21:14:16 -0000
@@ -104,7 +104,7 @@ function dblog_cron() {
 /**
  * Implementation of hook_user_cancel().
  */
-function dblog_user_cancel(&$edit, &$account, $method) {
+function dblog_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_reassign':
       db_update('watchdog')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute();
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1015
diff -u -p -r1.1015 node.module
--- modules/node/node.module	21 Jan 2009 14:50:58 -0000	1.1015
+++ modules/node/node.module	21 Jan 2009 21:14:17 -0000
@@ -1479,7 +1479,7 @@ function node_ranking() {
 /**
  * Implementation of hook_user_cancel().
  */
-function node_user_cancel(&$edit, &$account, $method) {
+function node_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_block_unpublish':
       // Unpublish nodes (current revisions).
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.285
diff -u -p -r1.285 poll.module
--- modules/poll/poll.module	21 Jan 2009 14:42:16 -0000	1.285
+++ modules/poll/poll.module	21 Jan 2009 21:14:18 -0000
@@ -817,7 +817,7 @@ function poll_cancel($form, &$form_state
 /**
  * Implementation of hook_user_cancel().
  */
-function poll_user_cancel(&$edit, &$account, $method) {
+function poll_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_reassign':
       db_update('poll_vote')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute();
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.250
diff -u -p -r1.250 profile.module
--- modules/profile/profile.module	11 Jan 2009 10:49:21 -0000	1.250
+++ modules/profile/profile.module	21 Jan 2009 21:14:18 -0000
@@ -254,7 +254,7 @@ function profile_user_validate(&$edit, &
 /**
  * Implementation of hook_user_categories().
  */
-function profile_user_categories(&$edit, &$user, $category = NULL) {
+function profile_user_categories($edit, $user, $category = NULL) {
   return profile_categories();
 }
 
Index: modules/simpletest/simpletest.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v
retrieving revision 1.15
diff -u -p -r1.15 simpletest.test
--- modules/simpletest/simpletest.test	12 Jan 2009 16:53:09 -0000	1.15
+++ modules/simpletest/simpletest.test	21 Jan 2009 21:14:18 -0000
@@ -147,7 +147,9 @@ class SimpleTestFunctionalTest extends D
     $this->assertAssertion('This is nothing.', 'Other', 'Pass', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()');
 
     // Check that errors that occur inside PHP internal functions are correctly reported.
-    $this->assertAssertion('The second argument should be either an array or an object', 'Warning', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()');
+    // The exact error message differs between php versions so we check only
+    // the function name 'array_key_exists'.
+    $this->assertAssertion('array_key_exists', 'Warning', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()');
 
     $this->test_ids[] = $test_id = $this->getTestIdFromResults();
     $this->assertTrue($test_id, t('Found test ID in results.'));
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.293
diff -u -p -r1.293 statistics.module
--- modules/statistics/statistics.module	8 Jan 2009 08:42:13 -0000	1.293
+++ modules/statistics/statistics.module	21 Jan 2009 21:14:18 -0000
@@ -184,7 +184,7 @@ function statistics_menu() {
 /**
  * Implementation of hook_user_cancel().
  */
-function statistics_user_cancel(&$edit, &$account, $method) {
+function statistics_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_reassign':
       db_update('accesslog')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute();
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.120
diff -u -p -r1.120 system.admin.inc
--- modules/system/system.admin.inc	21 Jan 2009 14:22:32 -0000	1.120
+++ modules/system/system.admin.inc	21 Jan 2009 21:14:20 -0000
@@ -2047,7 +2047,7 @@ function theme_system_admin_by_module($m
  *   An array of requirements.
  * @ingroup themeable
  */
-function theme_status_report(&$requirements) {
+function theme_status_report($requirements) {
   $i = 0;
   $output = '<table class="system-status-report">';
   foreach ($requirements as $requirement) {
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.27
diff -u -p -r1.27 trigger.module
--- modules/trigger/trigger.module	8 Jan 2009 08:42:13 -0000	1.27
+++ modules/trigger/trigger.module	21 Jan 2009 21:14:20 -0000
@@ -422,7 +422,7 @@ function trigger_user_login(&$edit, &$ac
 /**
  * Implementation of hook_user_logout().
  */
-function trigger_user_logout(&$edit, &$account) {
+function trigger_user_logout($edit, $account) {
   _trigger_user('logout', $edit, $account);
 }
 
@@ -443,7 +443,7 @@ function trigger_user_update(&$edit, &$a
 /**
  * Implementation of hook_user_cancel().
  */
-function trigger_user_cancel(&$edit, &$account, $method) {
+function trigger_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_reassign':
     case 'user_cancel_delete':
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.225
diff -u -p -r1.225 upload.module
--- modules/upload/upload.module	12 Jan 2009 08:29:09 -0000	1.225
+++ modules/upload/upload.module	21 Jan 2009 21:14:20 -0000
@@ -282,7 +282,7 @@ function upload_file_load($files) {
 /**
  * Implementation of hook_file_references().
  */
-function upload_file_references(&$file) {
+function upload_file_references($file) {
   // If upload.module is still using a file, do not let other modules delete it.
   $count = db_query('SELECT COUNT(*) FROM {upload} WHERE fid = :fid', array(':fid' => $file->fid))->fetchField();
   if ($count) {
@@ -294,7 +294,7 @@ function upload_file_references(&$file) 
 /**
  * Implementation of hook_file_delete().
  */
-function upload_file_delete(&$file) {
+function upload_file_delete($file) {
   // Delete all information associated with the file.
   db_delete('upload')->condition('fid', $file->fid)->execute();
 }
@@ -604,7 +604,7 @@ function _upload_form($node) {
  *
  * @ingroup themeable
  */
-function theme_upload_form_current(&$form) {
+function theme_upload_form_current($form) {
   $header = array('', t('Delete'), t('List'), t('Description'), t('Weight'), t('Size'));
   drupal_add_tabledrag('upload-attachments', 'order', 'sibling', 'upload-weight');
 
Index: modules/user/user.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.api.php,v
retrieving revision 1.2
diff -u -p -r1.2 user.api.php
--- modules/user/user.api.php	8 Jan 2009 08:42:13 -0000	1.2
+++ modules/user/user.api.php	21 Jan 2009 21:14:21 -0000
@@ -94,9 +94,9 @@ function hook_user($op, &$edit, &$accoun
  *
  * Expensive operations should be added to the global batch with batch_set().
  *
- * @param &$edit
+ * @param $edit
  *   The array of form values submitted by the user.
- * @param &$account
+ * @param $account
  *   The user object on which the operation is being performed.
  * @param $method
  *   The account cancellation method.
@@ -105,7 +105,7 @@ function hook_user($op, &$edit, &$accoun
  * @see hook_user_cancel_methods_alter()
  * @see user_cancel()
  */
-function hook_user_cancel(&$edit, &$account, $method) {
+function hook_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_block_unpublish':
       // Unpublish nodes (current revisions).
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.958
diff -u -p -r1.958 user.module
--- modules/user/user.module	21 Jan 2009 16:42:50 -0000	1.958
+++ modules/user/user.module	21 Jan 2009 21:14:22 -0000
@@ -790,7 +790,7 @@ function user_user_submit(&$edit, &$acco
 /**
  * Implementation of hook_user_categories.
  */
-function user_user_categories(&$edit, &$account, $category = NULL) {
+function user_user_categories($edit, $account, $category = NULL) {
     return array(array('name' => 'account', 'title' => t('Account settings'), 'weight' => 1));
 }
 
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.154
diff -u -p -r1.154 file.inc
--- includes/file.inc	21 Jan 2009 02:07:10 -0000	1.154
+++ includes/file.inc	21 Jan 2009 21:14:23 -0000
@@ -1100,7 +1100,7 @@ function file_validate_size($file, $file
  *
  * @see hook_file_validate()
  */
-function file_validate_is_image(&$file) {
+function file_validate_is_image($file) {
   $errors = array();
 
   $info = image_get_info($file->filepath);
@@ -1135,7 +1135,7 @@ function file_validate_is_image(&$file) 
  *
  * @see hook_file_validate()
  */
-function file_validate_image_resolution(&$file, $maximum_dimensions = 0, $minimum_dimensions = 0) {
+function file_validate_image_resolution($file, $maximum_dimensions = 0, $minimum_dimensions = 0) {
   $errors = array();
 
   // Check first that the file is an image.
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.315
diff -u -p -r1.315 form.inc
--- includes/form.inc	21 Jan 2009 16:58:41 -0000	1.315
+++ includes/form.inc	21 Jan 2009 21:14:25 -0000
@@ -291,6 +291,10 @@ function form_set_cache($form_build_id, 
  */
 function drupal_execute($form_id, &$form_state) {
   $args = func_get_args();
+  
+  // Make sure $form_state is passed around by reference.
+  $args[1] = &$form_state;
+
   $form = call_user_func_array('drupal_retrieve_form', $args);
   $form['#post'] = $form_state['values'];
   drupal_prepare_form($form_id, $form, $form_state);