summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Walker2005-04-26 14:57:37 (GMT)
committer James Walker2005-04-26 14:57:37 (GMT)
commitcfa287053acebf719fcd107a971a9acf92ec033a (patch)
tree569ffeba09749da6462b53d0422009379a6fafc9
parent1fb40367a9da79cd3b94789ec830bc742a2ffb39 (diff)
issue #20779 (for 4.6)
-rw-r--r--gallery.module6
1 files changed, 4 insertions, 2 deletions
diff --git a/gallery.module b/gallery.module
index 2dfe951..d9639c3 100644
--- a/gallery.module
+++ b/gallery.module
@@ -136,12 +136,14 @@ function gallery_block($op = 'list', $delta = 0) {
case 1:
$blocks = variable_get('gallery_blocks', array());
$show = variable_get('gallery_show', array());
- if (count($blocks) && count($show)) {
+ if (is_array($blocks) && count($blocks) > 0) {
_gallery_init();
$params = array('blocks' => implode('|', $blocks),
- 'show' => implode('|', $show),
'header' => 1,
'maxsize' => 140);
+ if (is_array($show)) {
+ $params['show'] = implode('|', $show);
+ }
list($ret, $content) = GalleryEmbed::getImageBlock($params);
if ($content) {