From c367b7d954e04cd10008c0f6111cb36c67b0ba0c Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 30 Jan 2012 20:15:24 -0800
Subject: [PATCH] Issue #1411592 by dadikof, Niklas Fiekas: Fixed
func_get_args() can't be used as a function parameter before PHP 5.3.
---
includes/bootstrap.inc | 3 ++-
includes/database/select.inc | 12 ++++++++----
modules/field_ui/field_ui.module | 3 ++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 56f86e1c618e..425a74acb397 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -2018,7 +2018,8 @@ function drupal_hash_base64($data) {
* @see drupal_array_merge_deep_array()
*/
function drupal_array_merge_deep() {
- return drupal_array_merge_deep_array(func_get_args());
+ $args = func_get_args();
+ return drupal_array_merge_deep_array($args);
}
/**
diff --git a/includes/database/select.inc b/includes/database/select.inc
index bf3ef5388d9d..7e2af85e791b 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -590,11 +590,13 @@ public function hasTag($tag) {
}
public function hasAllTags() {
- return call_user_func_array(array($this->query, 'hasAllTags'), func_get_args());
+ $args = func_get_args();
+ return call_user_func_array(array($this->query, 'hasAllTags'), $args);
}
public function hasAnyTag() {
- return call_user_func_array(array($this->query, 'hasAnyTags'), func_get_args());
+ $args = func_get_args();
+ return call_user_func_array(array($this->query, 'hasAnyTags'), $args);
}
public function addMetaData($key, $object) {
@@ -981,11 +983,13 @@ public function hasTag($tag) {
}
public function hasAllTags() {
- return !(boolean)array_diff(func_get_args(), array_keys($this->alterTags));
+ $args = func_get_args();
+ return !(boolean)array_diff($args, array_keys($this->alterTags));
}
public function hasAnyTag() {
- return (boolean)array_intersect(func_get_args(), array_keys($this->alterTags));
+ $args = func_get_args();
+ return (boolean)array_intersect($args, array_keys($this->alterTags));
}
public function addMetaData($key, $object) {
diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module
index b8b80db9687f..7bfb4faa7875 100644
--- a/modules/field_ui/field_ui.module
+++ b/modules/field_ui/field_ui.module
@@ -265,7 +265,8 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc
// part of _menu_check_access().
if ($visibility) {
// Grab the variable 'access arguments' part.
- $args = array_slice(func_get_args(), 4);
+ $all_args = func_get_args();
+ $args = array_slice($all_args, 4);
$callback = empty($access_callback) ? 0 : trim($access_callback);
if (is_numeric($callback)) {
return (bool) $callback;
--
GitLab