diff options
| author | plegall <plg@piwigo.org> | 2015-12-30 16:21:32 +0100 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2015-12-30 16:21:32 +0100 |
| commit | 3ec3cbe6cec5968d29cb11af139123191f4cb4ee (patch) | |
| tree | 34aecd51071d63f8df1862a1a11898d8c43fe68a /admin/include/updates.class.php | |
| parent | 6ba0148e646b2a193dc4111bb0a443d8c193e646 (diff) | |
| parent | 1681b02ee98c2deb740d394280a2a685170bc72e (diff) | |
Merge branch 'bug/385-php7'
Diffstat (limited to 'admin/include/updates.class.php')
| -rw-r--r-- | admin/include/updates.class.php | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php index 17a3b2578..29cefdfdb 100644 --- a/admin/include/updates.class.php +++ b/admin/include/updates.class.php @@ -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;
}
|