From e803820eb860ac75e10c43ca45308aad436d2685 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Thu, 27 Jul 2017 00:30:34 +0200
Subject: [PATCH] Compatibility with PHP 5.4

---
 .../views/handlers/views_handler_argument_many_to_one.inc       | 2 +-
 sites/all/modules/views/includes/base.inc                       | 2 +-
 .../modules/comment/views_handler_field_comment_username.inc    | 1 +
 .../views/modules/node/views_handler_filter_node_access.inc     | 2 +-
 .../views/modules/node/views_handler_filter_node_status.inc     | 2 +-
 .../views/modules/user/views_handler_field_user_name.inc        | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc b/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
index cc887d4..d078e34 100644
--- a/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
+++ b/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
@@ -13,7 +13,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 --git a/sites/all/modules/views/includes/base.inc b/sites/all/modules/views/includes/base.inc
index 7522d9f..126bde3 100644
--- a/sites/all/modules/views/includes/base.inc
+++ b/sites/all/modules/views/includes/base.inc
@@ -42,7 +42,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.
diff --git a/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc b/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
index 7b0a92f..7468eeb 100644
--- a/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
+++ b/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
@@ -29,6 +29,7 @@ class views_handler_field_comment_username extends views_handler_field {
 
   function render_link($data, $values) {
     if (!empty($this->options['link_to_user'])) {
+      $account = new stdClass();
       $account->uid = $values->{$this->aliases['uid']};
       $account->name = $values->{$this->field_alias};
       $account->homepage = $values->{$this->aliases['homepage']};
diff --git a/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc b/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
index f787aee..010a286 100644
--- a/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
+++ b/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_access extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
   function can_expose() {
     return FALSE;
   }
diff --git a/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc b/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
index 7047caa..a91b5c6 100644
--- a/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
+++ b/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_status extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
 
   function query() {
     $table = $this->ensure_my_table();
diff --git a/sites/all/modules/views/modules/user/views_handler_field_user_name.inc b/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
index 42ff1c8..deb814a 100644
--- a/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
+++ b/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
@@ -6,7 +6,7 @@ class views_handler_field_user_name extends views_handler_field_user {
   /**
    * Add uid in the query so we can test for anonymous if needed.
    */
-  function init(&$view, &$data) {
+  function init(&$view, $data) {
     parent::init($view, $data);
     if (!empty($this->options['overwrite_anonymous'])) {
       $this->additional_fields['uid'] = 'uid';