Skip to content
Permalink
Browse files
bug 3024: Warning: array_merge(): Argument 1 is not an array on templ…
…ate.class.php

git-svn-id: http://piwigo.org/svn/trunk@26863 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
mistic100 committed Jan 18, 2014
1 parent c1b07f9 commit 4a2ee2dfd7f83063b6564fa98a6850b24ba4d6c6
Showing 1 changed file with 28 additions and 12 deletions.
@@ -1159,12 +1159,20 @@ function parse_picture_buttons()
if (!empty($this->picture_buttons))
{
ksort($this->picture_buttons);
$this->assign('PLUGIN_PICTURE_BUTTONS',
array_reduce(
$this->picture_buttons,
create_function('$v,$w', 'return array_merge($v, $w);'),
array()
));
$buttons = array();
foreach ($this->picture_buttons as $k => $row)
{
$buttons = array_merge($buttons, $row);
}
$this->assign('PLUGIN_PICTURE_BUTTONS', $buttons);

// only for PHP 5.3
// $this->assign('PLUGIN_PICTURE_BUTTONS',
// array_reduce(
// $this->picture_buttons,
// create_function('$v,$w', 'return array_merge($v, $w);'),
// array()
// ));
}
}

@@ -1176,12 +1184,20 @@ function parse_index_buttons()
if (!empty($this->index_buttons))
{
ksort($this->index_buttons);
$this->assign('PLUGIN_INDEX_BUTTONS',
array_reduce(
$this->index_buttons,
create_function('$v,$w', 'return array_merge($v, $w);'),
array()
));
$buttons = array();
foreach ($this->index_buttons as $k => $row)
{
$buttons = array_merge($buttons, $row);
}
$this->assign('PLUGIN_INDEX_BUTTONS', $buttons);

// only for PHP 5.3
// $this->assign('PLUGIN_INDEX_BUTTONS',
// array_reduce(
// $this->index_buttons,
// create_function('$v,$w', 'return array_merge($v, $w);'),
// array()
// ));
}
}
}

0 comments on commit 4a2ee2d

Please sign in to comment.