iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 3024: Warning: array_merge(): Argument 1 is not an array on template.class.php

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@26863 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-01-18 15:11:59 +00:00
parent c1b07f9230
commit 4a2ee2dfd7
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/template.class.php
View File

@@ -1159,12 +1159,20 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
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 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
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()
// ));
}
}
}