adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1836 no longer use obsolete.list for minor updates

Browse Source
This commit is contained in:
plegall
2022-12-21 12:22:15 +01:00
parent 23a8d1d1fe
commit 00d5c8773c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/updates.class.php
+9 -2
View File
@@ -463,12 +463,15 @@ class updates
redirect(get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__))); redirect(get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__)));
} }
$obsolete_list = null;
if ($step == 2) if ($step == 2)
{ {
$code = get_branch_from_version(PHPWG_VERSION).'.x_to_'.$upgrade_to; $code = get_branch_from_version(PHPWG_VERSION).'.x_to_'.$upgrade_to;
$dl_code = str_replace(array('.', '_'), '', $code); $dl_code = str_replace(array('.', '_'), '', $code);
$remove_path = $code; $remove_path = $code;
$obsolete_list = 'obsolete.list'; // no longer try to delete files on a minor upgrade
// $obsolete_list = 'obsolete.list';
} }
else else
{ {
@@ -542,7 +545,11 @@ class updates
if (empty($error)) if (empty($error))
{ {
self::process_obsolete_list($obsolete_list); if (!empty($obsolete_list))
{
self::process_obsolete_list($obsolete_list);
}
deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update'); deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
invalidate_user_cache(true); invalidate_user_cache(true);
if ($step == 2) if ($step == 2)