summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-12-19 11:23:25 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-12-19 11:23:25 +0000
commit1ee3efdf5507343bf84e45255d0a9173d1bebb91 (patch)
tree0bbdbd6f39fd321d9ab808bde03e449f1ea811b4 /includes
parentc8826a6bc5ce3daf5b4681f4eba181ec70414f74 (diff)
downloadbrdo-1ee3efdf5507343bf84e45255d0a9173d1bebb91.tar.gz
brdo-1ee3efdf5507343bf84e45255d0a9173d1bebb91.tar.bz2
#202184 by Rho_pare: fix drupal_alter() not checking for having an array, broken by #192767
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 81d350452..5f131ae00 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2845,7 +2845,7 @@ function drupal_alter($type, &$data) {
// array. This is somewhat ugly, but is an unavoidable consequence of a flexible
// drupal_alter() function, and the limitations of func_get_args().
// @todo: Remove this in Drupal 7.
- if (isset($data['__drupal_alter_by_ref'])) {
+ if (is_array($data) && isset($data['__drupal_alter_by_ref'])) {
$by_ref_parameters = $data['__drupal_alter_by_ref'];
unset($data['__drupal_alter_by_ref']);
}