? .git ? 348975-clone-display_0.patch ? 788950-override.patch ? 886970-placeholders_0.patch ? 893128-views-stricts-D7.patch ? bar.patch ? dpr-error.patch ? foo.patch ? reorder-displays_5_0_0.patch ? reorder-displays_5_0_0.patch.1 ? substitions.patch ? views-2.3-ignorecase-1.patch ? views-6.x-2.x-ignorecase-2.patch ? views-or-revert.patch ? views-or.patch ? views_621142-16_2_0_1.patch ? views_812970-3.patch ? includes/database ? modules/simpletest Index: handlers/views_handler_field.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field.inc,v retrieving revision 1.33.4.22 diff -u -p -r1.33.4.22 views_handler_field.inc --- handlers/views_handler_field.inc 13 Aug 2010 19:41:18 -0000 1.33.4.22 +++ handlers/views_handler_field.inc 25 Aug 2010 20:28:38 -0000 @@ -48,7 +48,7 @@ class views_handler_field extends views_ return TRUE; } - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); $this->options += array( Index: handlers/views_handler_field_boolean.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_boolean.inc,v retrieving revision 1.3.4.2 diff -u -p -r1.3.4.2 views_handler_field_boolean.inc --- handlers/views_handler_field_boolean.inc 15 May 2010 07:27:59 -0000 1.3.4.2 +++ handlers/views_handler_field_boolean.inc 25 Aug 2010 20:28:38 -0000 @@ -26,7 +26,7 @@ class views_handler_field_boolean extend return $options; } - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); $default_formats = array( Index: handlers/views_handler_field_group_by_numeric.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_field_group_by_numeric.inc,v retrieving revision 1.1.4.3 diff -u -p -r1.1.4.3 views_handler_field_group_by_numeric.inc --- handlers/views_handler_field_group_by_numeric.inc 7 Mar 2010 08:28:35 -0000 1.1.4.3 +++ handlers/views_handler_field_group_by_numeric.inc 25 Aug 2010 20:28:38 -0000 @@ -5,7 +5,7 @@ * Handler for GROUP BY on simple numeric fields. */ class views_handler_field_group_by_numeric extends views_handler_field { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); // Initialize the original handler. Index: handlers/views_handler_filter.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter.inc,v retrieving revision 1.10.4.8 diff -u -p -r1.10.4.8 views_handler_filter.inc --- handlers/views_handler_filter.inc 24 Aug 2010 16:13:21 -0000 1.10.4.8 +++ handlers/views_handler_filter.inc 25 Aug 2010 20:28:39 -0000 @@ -21,7 +21,7 @@ class views_handler_filter extends views * This likely has to be overridden by filters which are more complex * than simple operator/value. */ - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); $this->operator = $this->options['operator']; Index: handlers/views_handler_filter_many_to_one.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_many_to_one.inc,v retrieving revision 1.2.4.3 diff -u -p -r1.2.4.3 views_handler_filter_many_to_one.inc --- handlers/views_handler_filter_many_to_one.inc 8 Mar 2010 19:53:43 -0000 1.2.4.3 +++ handlers/views_handler_filter_many_to_one.inc 25 Aug 2010 20:28:39 -0000 @@ -10,7 +10,7 @@ * to provide something that isn't just a select list. */ class views_handler_filter_many_to_one extends views_handler_filter_in_operator { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); $this->helper = new views_many_to_one_helper($this); } Index: handlers/views_handler_relationship.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_relationship.inc,v retrieving revision 1.4.4.2 diff -u -p -r1.4.4.2 views_handler_relationship.inc --- handlers/views_handler_relationship.inc 9 Nov 2009 22:49:56 -0000 1.4.4.2 +++ handlers/views_handler_relationship.inc 25 Aug 2010 20:28:39 -0000 @@ -38,7 +38,7 @@ class views_handler_relationship extends * Init handler to let relationships live on tables other than * the table they operate on. */ - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); if (isset($this->definition['relationship table'])) { $this->table = $this->definition['relationship table']; Index: handlers/views_handler_sort_group_by_numeric.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_sort_group_by_numeric.inc,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 views_handler_sort_group_by_numeric.inc --- handlers/views_handler_sort_group_by_numeric.inc 24 Jan 2010 22:37:52 -0000 1.1.4.2 +++ handlers/views_handler_sort_group_by_numeric.inc 25 Aug 2010 20:28:39 -0000 @@ -4,7 +4,7 @@ * Handler for GROUP BY on simple numeric fields. */ class views_handler_sort_group_by_numeric extends views_handler_sort { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); // Initialize the original handler. Index: includes/admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/admin.inc,v retrieving revision 1.161.4.46 diff -u -p -r1.161.4.46 admin.inc --- includes/admin.inc 24 Aug 2010 16:13:22 -0000 1.161.4.46 +++ includes/admin.inc 25 Aug 2010 20:28:39 -0000 @@ -1072,7 +1072,8 @@ function template_preprocess_views_ui_ed 'args' => array(), ), ); - $vars['preview'] = drupal_render(drupal_build_form('views_ui_preview_form', $form_state)); + $preview_form = drupal_build_form('views_ui_preview_form', $form_state); + $vars['preview'] = drupal_render($preview_form); $vars['locked'] = NULL; if (isset($view->locked) && is_object($view->locked)) { @@ -1158,8 +1159,10 @@ function template_preprocess_views_ui_ed unset($_POST['form_id']); } $form_state = array('view' => &$view, 'display_id' => $display->id, 'ajax' => FALSE, 'build_info' => array('args' => array())); - $vars['remove'] = drupal_render(drupal_build_form('views_ui_remove_display_form', $form_state)); - $vars['clone'] = drupal_render(drupal_build_form('views_ui_clone_display_form', $form_state)); + $remove_form = drupal_build_form('views_ui_remove_display_form', $form_state); + $clone_form = drupal_build_form('views_ui_clone_display_form', $form_state); + $vars['remove'] = drupal_render($remove_form); + $vars['clone'] = drupal_render($clone_form); } // basic fields @@ -3333,4 +3336,3 @@ function theme_views_ui_style_plugin_tab $output .= drupal_render_children($form); return $output; } - Index: includes/base.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/base.inc,v retrieving revision 1.3.4.4 diff -u -p -r1.3.4.4 base.inc --- includes/base.inc 27 Jul 2010 22:03:08 -0000 1.3.4.4 +++ includes/base.inc 25 Aug 2010 20:28:39 -0000 @@ -43,7 +43,7 @@ class views_object { * Set default options on this object. Called by the constructor in a * complex chain to deal with backward compatibility. */ - function options() { } + function options(&$options) { } /** * Set default options. Index: includes/handlers.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/handlers.inc,v retrieving revision 1.119.4.10 diff -u -p -r1.119.4.10 handlers.inc --- includes/handlers.inc 19 Jul 2010 09:18:42 -0000 1.119.4.10 +++ includes/handlers.inc 25 Aug 2010 20:28:40 -0000 @@ -130,7 +130,7 @@ class views_handler extends views_object * The item from the database; the actual contents of this will vary * based upon the type of handler. */ - function init(&$view, $options) { + function init(&$view, &$options) { $this->view = &$view; $this->unpack_options($this->options, $options); Index: modules/comment/views_handler_field_node_new_comments.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_node_new_comments.inc,v retrieving revision 1.7.4.2 diff -u -p -r1.7.4.2 views_handler_field_node_new_comments.inc --- modules/comment/views_handler_field_node_new_comments.inc 9 Nov 2009 22:46:05 -0000 1.7.4.2 +++ modules/comment/views_handler_field_node_new_comments.inc 25 Aug 2010 20:28:40 -0000 @@ -5,7 +5,7 @@ * Field handler to display the number of new comments */ class views_handler_field_node_new_comments extends views_handler_field_numeric { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); // translate an older setting: Index: modules/node/views_handler_field_history_user_timestamp.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_history_user_timestamp.inc,v retrieving revision 1.1.6.2 diff -u -p -r1.1.6.2 views_handler_field_history_user_timestamp.inc --- modules/node/views_handler_field_history_user_timestamp.inc 6 Feb 2010 16:29:52 -0000 1.1.6.2 +++ modules/node/views_handler_field_history_user_timestamp.inc 25 Aug 2010 20:28:40 -0000 @@ -6,7 +6,7 @@ * The handler is named history_user, because of compability reasons, the table is history. */ class views_handler_field_history_user_timestamp extends views_handler_field_node { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); global $user; if ($user->uid) { Index: modules/node/views_handler_field_node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node.inc,v retrieving revision 1.7.4.4 diff -u -p -r1.7.4.4 views_handler_field_node.inc --- modules/node/views_handler_field_node.inc 16 Mar 2010 23:08:58 -0000 1.7.4.4 +++ modules/node/views_handler_field_node.inc 25 Aug 2010 20:28:40 -0000 @@ -10,7 +10,7 @@ */ class views_handler_field_node extends views_handler_field { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); if (!empty($this->options['link_to_node'])) { $this->additional_fields['nid'] = array('table' => 'node', 'field' => 'nid'); Index: modules/node/views_handler_field_node_revision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/Attic/views_handler_field_node_revision.inc,v retrieving revision 1.1.6.2 diff -u -p -r1.1.6.2 views_handler_field_node_revision.inc --- modules/node/views_handler_field_node_revision.inc 12 Mar 2010 09:00:15 -0000 1.1.6.2 +++ modules/node/views_handler_field_node_revision.inc 25 Aug 2010 20:28:40 -0000 @@ -6,7 +6,7 @@ */ class views_handler_field_node_revision extends views_handler_field_node { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); if (!empty($this->options['link_to_node_revision'])) { $this->additional_fields['vid'] = 'vid'; Index: modules/taxonomy/views_handler_field_term_node_tid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc,v retrieving revision 1.4.4.2 diff -u -p -r1.4.4.2 views_handler_field_term_node_tid.inc --- modules/taxonomy/views_handler_field_term_node_tid.inc 28 Nov 2009 09:21:38 -0000 1.4.4.2 +++ modules/taxonomy/views_handler_field_term_node_tid.inc 25 Aug 2010 20:28:40 -0000 @@ -5,7 +5,7 @@ * Field handler for terms. */ class views_handler_field_term_node_tid extends views_handler_field_prerender_list { - function init(&$view, $options) { + function init(&$view, &$options) { parent::init($view, $options); if ($view->base_table == 'node_revisions') { $this->additional_fields['vid'] = array('table' => 'node_revisions', 'field' => 'vid');