mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix 2.0.2 upgrader resting dirs removal

Browse Source
This commit is contained in:
Ian
2015-03-17 08:39:02 +01:00
parent 2970ac60a6
commit 8b863d5370
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/admin/upgrader.inc.php
View File

@ -246,8 +246,14 @@ $tasks = array(array('version' => '0.5.1',
array('version' => '2.0.2',
'function' => 'serendipity_removeDeadFiles_SPL',
'title' => 'Removal of obsolete and still resting files in 2.0',
'arguments' => array(substr($serendipity['serendipityPath'], 0, -1), $dead_files_rest, array('htmlarea/plugins/ImageManager','htmlarea/plugins', 'bundled-libs/YahooUI/treeview', 'bundled-libs/YahooUI'), true),
'desc' => 'The following dead files will additionally be removed from "/" and "htmlarea".<br><pre>' . implode(', ', $dead_files_rest) . '</pre>'),
'arguments' => array(substr($serendipity['serendipityPath'], 0, -1), $dead_files_rest, array('internals'), true),
'desc' => 'The following old dead files will additionally be removed from your system.<br><pre>' . implode(', ', $dead_files_rest) . '</pre>'),
array('version' => '2.0.2',
'function' => 'recursive_directory_iterator',
'title' => 'Removal of obsolete and dead directories',
'arguments' => array($dead_dirs_rest),
'desc' => 'The following old dead directories will additionally be removed from your system.<br><pre>' . implode(', ', $dead_dirs_rest) . '</pre>'),
);

10
include/functions_upgrader.inc.php
View File

@ -155,7 +155,7 @@ $dead_htmlarea_dirs = array(
$serendipity['serendipityPath'] . 'htmlarea/ckeditor/samples'
);
/* A list of old Serendipity files which were not marked obsolet with 2.0.0 upgrade before - now 2.0.1 */
/* A list of old Serendipity files which were not marked obsolet with 2.0.0 upgrade before - now 2.0.2 */
$dead_files_rest = array(
'serendipity_editor.js',
'serendipity_define.js.php',
@ -176,6 +176,14 @@ $dead_files_rest = array(
'htmlarea/release-notes.html'
);
/* A list of old lib directories which were not marked obsolet with 2.0.0 upgrade before - now 2.0.2 */
$dead_dirs_rest = array(
$serendipity['serendipityPath'] . 'htmlarea/plugins/ImageManage',
$serendipity['serendipityPath'] . 'htmlarea/plugins',
$serendipity['serendipityPath'] . 'bundled-libs/YahooUI/treeview',
$serendipity['serendipityPath'] . 'bundled-libs/YahooUI'
);
/**
* recursive directory call to purge files and directories
*