michael@531: Since PHP 5.3 calling functions with objects and having the function
michael@532: declare the object parameter as a reference causes a runtime error.
michael@532: The "call by reference" indicator "&" has to be removed from parameters
michael@532: which are known to be passed as objects (by reference.)
michael@531: 
michael@531: Index: sites/all/modules/diff/diff.module
michael@531: --- sites/all/modules/diff/diff.module.orig	2010-08-12 18:34:08.000000000 +0200
michael@531: +++ sites/all/modules/diff/diff.module	2010-08-13 14:18:26.000000000 +0200
michael@532: @@ -78,7 +78,7 @@
michael@531:  /**
michael@531:   * Implementation of hook_menu_alter().
michael@531:   */
michael@531: -function diff_menu_alter(&$callbacks) {
michael@531: +function diff_menu_alter($callbacks) {
michael@531:    // Overwrite the default 'Revisions' page
michael@531:    $callbacks['node/%node/revisions']['page callback'] = 'diff_diffs_overview';
michael@531:    $callbacks['node/%node/revisions']['module'] = 'diff';
michael@532: @@ -128,7 +128,7 @@
michael@531:  /**
michael@531:   * Implementation of hook_nodeapi().
michael@531:   */
michael@532: -function diff_node_view_alter(&$build) {
michael@532: +function diff_node_view_alter($build) {
michael@532:    $node = $build['#node'];
michael@532:    if (user_access('view revisions') && variable_get('show_diff_inline_'. $node->type, FALSE)) {
michael@531:      // Ugly but cheap way to check that we are viewing a node's revision page.
michael@532: @@ -146,7 +146,7 @@
michael@531:  /**
michael@532:   * Implements hook_form_alter().
michael@531:   */
michael@531: -function diff_form_alter(&$form, $form_state, $form_id) {
michael@531: +function diff_form_alter($form, $form_state, $form_id) {
michael@532:    if (!empty($form['#node_edit_form'])) {
michael@531:      // Add a 'View changes' button on the node edit form.
michael@531:      if (variable_get('show_preview_changes_'. $form['type']['#value'], TRUE) && $form['nid']['#value'] > 0) {
michael@532: @@ -163,7 +163,7 @@
michael@532:  /**
michael@532:   * Implements hook_form_alter() for node_type_form.
michael@532:   */
michael@532: -function diff_form_node_type_form_alter(&$form, $form_state) {
michael@532: +function diff_form_node_type_form_alter($form, $form_state) {
michael@532:    if (isset($form['type'])) {
michael@532:      // Node type edit form.
michael@532:      // Add checkbox to activate 'View changes' button per node type.
michael@532: @@ -198,7 +198,7 @@
michael@531:  /**
michael@531:   * Callback if 'View changes' is pressed.
michael@531:   */
michael@531: -function diff_node_form_build_preview_changes($form, &$form_state) {
michael@531: +function diff_node_form_build_preview_changes($form, $form_state) {
michael@531:    module_load_include('inc', 'diff', 'diff.pages');
michael@532:    $old_node = clone node_load($form_state['values']['nid']);
michael@531:    $node = node_form_submit_build_node($form, $form_state);
michael@532: @@ -342,7 +342,7 @@
michael@531:  /**
michael@531:   * Form submission handler for diff_inline_form() for JS-disabled clients.
michael@531:   */
michael@531: -function diff_inline_form_submit(&$form, &$form_state) {
michael@531: +function diff_inline_form_submit($form, $form_state) {
michael@531:    if (isset($form_state['values']['revision'], $form_state['values']['node'])) {
michael@531:      $node = $form_state['values']['node'];
michael@531:      $vid = $form_state['values']['revision'];