diff -ru /tmp/views/views/handlers/views_handler_argument.inc views/handlers/views_handler_argument.inc
--- /tmp/views/views/handlers/views_handler_argument.inc 2010-03-12 22:25:33.000000000 +0100
+++ views/handlers/views_handler_argument.inc 2010-04-18 01:58:12.000000000 +0200
@@ -46,7 +46,7 @@
}
}
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
}
diff -ru /tmp/views/views/handlers/views_handler_argument_many_to_one.inc views/handlers/views_handler_argument_many_to_one.inc
--- /tmp/views/views/handlers/views_handler_argument_many_to_one.inc 2010-03-22 21:40:41.000000000 +0100
+++ views/handlers/views_handler_argument_many_to_one.inc 2010-04-18 01:58:13.000000000 +0200
@@ -14,7 +14,7 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_many_to_one extends views_handler_argument {
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
$this->helper = new views_many_to_one_helper($this);
diff -ru /tmp/views/views/handlers/views_handler_argument_string.inc views/handlers/views_handler_argument_string.inc
--- /tmp/views/views/handlers/views_handler_argument_string.inc 2009-06-25 23:58:17.000000000 +0200
+++ views/handlers/views_handler_argument_string.inc 2010-04-18 01:58:13.000000000 +0200
@@ -8,7 +8,7 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_string extends views_handler_argument {
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
if (!empty($this->definition['many to one'])) {
$this->helper = new views_many_to_one_helper($this);
diff -ru /tmp/views/views/handlers/views_handler_filter_boolean_operator.inc views/handlers/views_handler_filter_boolean_operator.inc
--- /tmp/views/views/handlers/views_handler_filter_boolean_operator.inc 2010-03-13 01:51:00.000000000 +0100
+++ views/handlers/views_handler_filter_boolean_operator.inc 2010-04-18 01:58:15.000000000 +0200
@@ -103,7 +103,7 @@
}
}
- function value_validate(&$form, &$form_state) {
+ function value_validate($form, &$form_state) {
if ($form_state['values']['options']['value'] == 'All' && empty($form_state['values']['options']['expose']['optional'])) {
form_set_error('value', t('You must select a value unless this is an optional exposed filter.'));
}
diff -ru /tmp/views/views/handlers/views_handler_filter_date.inc views/handlers/views_handler_filter_date.inc
--- /tmp/views/views/handlers/views_handler_filter_date.inc 2010-03-10 21:28:26.000000000 +0100
+++ views/handlers/views_handler_filter_date.inc 2010-04-18 01:58:15.000000000 +0200
@@ -32,7 +32,7 @@
parent::value_form($form, $form_state);
}
- function options_validate(&$form, &$form_state) {
+ function options_validate($form, &$form_state) {
parent::options_validate($form, $form_state);
if (!empty($form_state['values']['options']['expose']['optional'])) {
diff -ru /tmp/views/views/handlers/views_handler_filter.inc views/handlers/views_handler_filter.inc
--- /tmp/views/views/handlers/views_handler_filter.inc 2009-12-23 20:21:34.000000000 +0100
+++ views/handlers/views_handler_filter.inc 2010-04-18 01:58:15.000000000 +0200
@@ -92,7 +92,7 @@
/**
* Simple validate handler
*/
- function options_validate(&$form, &$form_state) {
+ function options_validate($form, &$form_state) {
$this->operator_validate($form, $form_state);
$this->value_validate($form, $form_state);
if (!empty($this->options['exposed'])) {
@@ -104,7 +104,7 @@
/**
* Simple submit handler
*/
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
unset($form_state['values']['expose_button']); // don't store this.
$this->operator_submit($form, $form_state);
$this->value_submit($form, $form_state);
diff -ru /tmp/views/views/includes/base.inc views/includes/base.inc
--- /tmp/views/views/includes/base.inc 2009-06-26 00:15:39.000000000 +0200
+++ views/includes/base.inc 2010-04-18 01:58:32.000000000 +0200
@@ -43,7 +43,7 @@
* 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.
diff -ru /tmp/views/views/includes/plugins.inc views/includes/plugins.inc
--- /tmp/views/views/includes/plugins.inc 2009-12-01 00:55:33.000000000 +0100
+++ views/includes/plugins.inc 2010-04-18 01:58:33.000000000 +0200
@@ -364,12 +364,12 @@
/**
* Validate the options form.
*/
- function options_validate(&$form, &$form_state) { }
+ function options_validate($form, &$form_state) { }
/**
* Handle any special handling on the validate form.
*/
- function options_submit(&$form, &$form_state) { }
+ function options_submit($form, &$form_state) { }
/**
* Add anything to the query that we might need to.
diff -ru /tmp/views/views/includes/view.inc views/includes/view.inc
--- /tmp/views/views/includes/view.inc 2010-03-22 21:55:11.000000000 +0100
+++ views/includes/view.inc 2010-04-18 01:58:34.000000000 +0200
@@ -79,7 +79,7 @@
* Note: In PHP5 this should be static, but PHP4 doesn't support static
* methods.
*/
- function db_objects() {
+ static function db_objects() {
return array('display');
}
@@ -1289,7 +1289,7 @@
* If TRUE, reset this entry in the load cache.
* @return A view object or NULL if it was not available.
*/
- function &load($arg, $reset = FALSE) {
+ static function &load($arg, $reset = FALSE) {
static $cache = array();
// We want a NULL value to return TRUE here, so we can't use isset() or empty().
@@ -1342,7 +1342,7 @@
* that would be very slow. Buiding the views externally from unified queries is
* much faster.
*/
- function load_views() {
+ static function load_views() {
$result = db_query("SELECT DISTINCT v.* FROM {views_view} v");
$views = array();
$vids = array();
diff -ru /tmp/views/views/modules/comment/views_handler_field_comment.inc views/modules/comment/views_handler_field_comment.inc
--- /tmp/views/views/modules/comment/views_handler_field_comment.inc 2009-02-10 21:37:49.000000000 +0100
+++ views/modules/comment/views_handler_field_comment.inc 2010-04-18 01:58:37.000000000 +0200
@@ -7,7 +7,7 @@
/**
* Override init function to provide generic option to link to comment.
*/
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
if (!empty($this->options['link_to_comment'])) {
$this->additional_fields['cid'] = 'cid';
diff -ru /tmp/views/views/modules/system/views_handler_field_file.inc views/modules/system/views_handler_field_file.inc
--- /tmp/views/views/modules/system/views_handler_field_file.inc 2009-01-30 01:01:42.000000000 +0100
+++ views/modules/system/views_handler_field_file.inc 2010-04-18 01:58:50.000000000 +0200
@@ -7,7 +7,7 @@
/**
* Constructor to provide additional field to add.
*/
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
if (!empty($options['link_to_file'])) {
$this->additional_fields['filepath'] = 'filepath';
diff -ru /tmp/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc views/modules/taxonomy/views_handler_filter_term_node_tid.inc
--- /tmp/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc 2009-04-08 01:21:01.000000000 +0200
+++ views/modules/taxonomy/views_handler_filter_term_node_tid.inc 2010-04-18 01:58:51.000000000 +0200
@@ -174,7 +174,7 @@
}
}
- function value_validate(&$form, &$form_state) {
+ function value_validate($form, &$form_state) {
// We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') {
return;
diff -ru /tmp/views/views/modules/upload/views_handler_field_upload_description.inc views/modules/upload/views_handler_field_upload_description.inc
--- /tmp/views/views/modules/upload/views_handler_field_upload_description.inc 2010-04-08 01:40:35.000000000 +0200
+++ views/modules/upload/views_handler_field_upload_description.inc 2010-04-18 01:58:55.000000000 +0200
@@ -5,7 +5,7 @@
* Field handler to provide a list of roles.
*/
class views_handler_field_upload_description extends views_handler_field {
- function init(&$view, &$options) {
+ function init(&$view, $options) {
parent::init($view, $options);
if (!empty($options['link_to_file'])) {
$this->additional_fields['fid'] = 'fid';
diff -ru /tmp/views/views/modules/user/views_handler_filter_user_name.inc views/modules/user/views_handler_filter_user_name.inc
--- /tmp/views/views/modules/user/views_handler_filter_user_name.inc 2008-09-23 01:41:14.000000000 +0200
+++ views/modules/user/views_handler_filter_user_name.inc 2010-04-18 01:58:57.000000000 +0200
@@ -36,7 +36,7 @@
}
}
- function value_validate(&$form, &$form_state) {
+ function value_validate($form, &$form_state) {
$values = drupal_explode_tags($form_state['values']['options']['value']);
$uids = $this->validate_user_strings($form['value'], $values);
diff -ru /tmp/views/views/plugins/views_plugin_access.inc views/plugins/views_plugin_access.inc
--- /tmp/views/views/plugins/views_plugin_access.inc 2008-09-09 00:50:17.000000000 +0200
+++ views/plugins/views_plugin_access.inc 2010-04-18 01:58:59.000000000 +0200
@@ -40,12 +40,12 @@
/**
* Provide the default form form for validating options
*/
- function options_validate(&$form, &$form_state) { }
+ function options_validate($form, &$form_state) { }
/**
* Provide the default form form for submitting options
*/
- function options_submit(&$form, &$form_state) { }
+ function options_submit($form, &$form_state) { }
/**
* Return a string to display as the clickable title for the
diff -ru /tmp/views/views/plugins/views_plugin_access_role.inc views/plugins/views_plugin_access_role.inc
--- /tmp/views/views/plugins/views_plugin_access_role.inc 2010-03-10 22:03:25.000000000 +0100
+++ views/plugins/views_plugin_access_role.inc 2010-04-18 01:58:59.000000000 +0200
@@ -42,7 +42,7 @@
);
}
- function options_validate(&$form, &$form_state) {
+ function options_validate($form, &$form_state) {
if (!array_filter($form_state['values']['access_options']['role'])) {
form_error($form['role'], t('You must select at least one role if type is "by role"'));
}
diff -ru /tmp/views/views/plugins/views_plugin_display_attachment.inc views/plugins/views_plugin_display_attachment.inc
--- /tmp/views/views/plugins/views_plugin_display_attachment.inc 2009-11-30 20:05:47.000000000 +0100
+++ views/plugins/views_plugin_display_attachment.inc 2010-04-18 01:59:01.000000000 +0200
@@ -186,7 +186,7 @@
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
diff -ru /tmp/views/views/plugins/views_plugin_display_block.inc views/plugins/views_plugin_display_block.inc
--- /tmp/views/views/plugins/views_plugin_display_block.inc 2009-06-26 02:23:42.000000000 +0200
+++ views/plugins/views_plugin_display_block.inc 2010-04-18 01:59:01.000000000 +0200
@@ -156,7 +156,7 @@
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
diff -ru /tmp/views/views/plugins/views_plugin_display_feed.inc views/plugins/views_plugin_display_feed.inc
--- /tmp/views/views/plugins/views_plugin_display_feed.inc 2009-09-16 00:20:01.000000000 +0200
+++ views/plugins/views_plugin_display_feed.inc 2010-04-18 01:59:02.000000000 +0200
@@ -163,7 +163,7 @@
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
diff -ru /tmp/views/views/plugins/views_plugin_display.inc views/plugins/views_plugin_display.inc
--- /tmp/views/views/plugins/views_plugin_display.inc 2010-04-09 00:18:12.000000000 +0200
+++ views/plugins/views_plugin_display.inc 2010-04-18 01:59:01.000000000 +0200
@@ -1476,7 +1476,7 @@
/**
* Validate the options form.
*/
- function options_validate(&$form, &$form_state) {
+ function options_validate($form, &$form_state) {
switch ($form_state['section']) {
case 'css_class':
$css_class = $form_state['values']['css_class'];
@@ -1512,7 +1512,7 @@
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
// Not sure I like this being here, but it seems (?) like a logical place.
$cache_plugin = $this->get_cache_plugin();
if ($cache_plugin) {
diff -ru /tmp/views/views/plugins/views_plugin_display_page.inc views/plugins/views_plugin_display_page.inc
--- /tmp/views/views/plugins/views_plugin_display_page.inc 2010-03-11 01:01:34.000000000 +0100
+++ views/plugins/views_plugin_display_page.inc 2010-04-18 01:59:02.000000000 +0200
@@ -428,7 +428,7 @@
}
}
- function options_validate(&$form, &$form_state) {
+ function options_validate($form, &$form_state) {
// It is very important to call the parent function here:
parent::options_validate($form, $form_state);
switch ($form_state['section']) {
@@ -466,7 +466,7 @@
}
}
- function options_submit(&$form, &$form_state) {
+ function options_submit($form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {