mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-03-28 17:42:57 +01:00
bug #385 PHP7 compatibility
* array concatenation no longer seem to work
This commit is contained in:
@@ -135,15 +135,33 @@ class updates
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
$servers = array();
|
||||
|
||||
foreach ($pem_exts as $ext)
|
||||
{
|
||||
if (isset($ext_to_check[$ext['extension_id']]))
|
||||
{
|
||||
$server = 'server_'.$ext_to_check[$ext['extension_id']];
|
||||
$this->$ext_to_check[$ext['extension_id']]->$server += array($ext['extension_id'] => $ext);
|
||||
$type = $ext_to_check[$ext['extension_id']];
|
||||
|
||||
if (!isset($servers[$type]))
|
||||
{
|
||||
$servers[$type] = array();
|
||||
}
|
||||
|
||||
$servers[$type][ $ext['extension_id'] ] = $ext;
|
||||
|
||||
unset($ext_to_check[$ext['extension_id']]);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($servers as $server_type => $extension_list)
|
||||
{
|
||||
$server_string = 'server_'.$server_type;
|
||||
|
||||
$this->$server_type->$server_string = $extension_list;
|
||||
}
|
||||
|
||||
$this->check_missing_extensions($ext_to_check);
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user