diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 3 | ||||
| -rw-r--r-- | includes/database/select.inc | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 56f86e1c6..425a74acb 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 bf3ef5388..7e2af85e7 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -590,11 +590,13 @@ class SelectQueryExtender implements SelectQueryInterface { } 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 @@ class SelectQuery extends Query implements SelectQueryInterface { } 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) { |