Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.682 diff -u -p -r1.682 comment.module --- modules/comment/comment.module 14 Jan 2009 21:48:24 -0000 1.682 +++ modules/comment/comment.module 21 Jan 2009 16:24:35 -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 16:24:35 -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 16:24:37 -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 16:24:38 -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 16:24:38 -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 16:24:38 -0000 @@ -120,7 +120,7 @@ class SimpleTestFunctionalTest extends D $this->assertNothing(); // Generates a warning inside a PHP function. - array_key_exists(NULL, NULL); + trigger_error('Simpletest test warning message', E_USER_WARNING); } /** @@ -147,7 +147,7 @@ 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()'); + $this->assertAssertion('Simpletest test warning message', 'User 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 16:24:39 -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 16:24:40 -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 = '