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

upgrade task - remove still resting files

Browse Source 
Please check for more to include to the rest array!
This commit is contained in:
Ian 2015-02-06 14:05:30 +01:00
parent 0670bb86c1
commit 441bb6d56f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,21 +225,31 @@ $tasks = array(array('version' => '0.5.1',
'function' => 'serendipity_upgrader_move_syndication_config', 'function' => 'serendipity_upgrader_move_syndication_config',
'title' => 'Export syndication plugin options', 'title' => 'Export syndication plugin options',
'desc' => 'Serendipity 2.0 moved the more generic feed option from the syndication plugin into the core. They will be set equivalent to their old configuration.'), 'desc' => 'Serendipity 2.0 moved the more generic feed option from the syndication plugin into the core. They will be set equivalent to their old configuration.'),
array('version' => '2.0-beta5', array('version' => '2.0-beta5',
'function' => 'serendipity_killPlugin', 'function' => 'serendipity_killPlugin',
'arguments' => array('serendipity_event_autosave'), 'arguments' => array('serendipity_event_autosave'),
'title' => 'Remove autosave plugin', 'title' => 'Remove autosave plugin',
'desc' => 'Serendipity 2.0 includes autosave functionality, and the autosave plugin collides with new functionality. It has to be removed.'), 'desc' => 'Serendipity 2.0 includes autosave functionality, and the autosave plugin collides with new functionality. It has to be removed.'),
array('version' => '2.0-beta5',
array('version' => '2.0-beta5',
'function' => 'serendipity_killPlugin', 'function' => 'serendipity_killPlugin',
'arguments' => array('serendipity_event_dashboard'), 'arguments' => array('serendipity_event_dashboard'),
'title' => 'Remove dashboard plugin', 'title' => 'Remove dashboard plugin',
'desc' => 'Serendipity 2.0 includes a dashboard in the admin theme. The separate plugin for 1.x has to be removed.'), 'desc' => 'Serendipity 2.0 includes a dashboard in the admin theme. The separate plugin for 1.x has to be removed.'),
array('version' => '2.0-beta6', array('version' => '2.0-beta6',
'function' => 'serendipity_installFiles', 'function' => 'serendipity_installFiles',
'title' => 'Update of .htaccess file', 'title' => 'Update of .htaccess file',
'desc' => 'Changes were made to the .htaccess file to allow for new patterns, it will be recreated. If you manually modified the file, make sure your modification are in place afterwards.'), 'desc' => 'Changes were made to the .htaccess file to allow for new patterns, it will be recreated. If you manually modified the file, make sure your modification are in place afterwards.'),
array('version' => '2.0.1',
'function' => 'serendipity_removeDeadFiles_SPL',
'title' => 'Removal of obsolete and still resting files in 2.0.0',
'arguments' => array($serendipity['serendipityPath'] . 'htmlarea', $dead_files_rest, array('internals'), true),
'desc' => 'The following dead files will additionally be removed from "/" and "htmlarea".<br /><pre>' . implode(', ', $dead_files_rest) . '</pre>'),
); );
/* Fetch SQL files which needs to be run */ /* Fetch SQL files which needs to be run */

8
include/functions_upgrader.inc.php
View File

@ -155,6 +155,14 @@ $dead_htmlarea_dirs = array(
$serendipity['serendipityPath'] . 'htmlarea/ckeditor/samples' $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 */
$dead_files_rest = array(
'serendipity_editor.js',
'htmlarea/ChangeLog',
'htmlarea/dialog.js',
'htmlarea/release-notes.html'
);
/** /**
* recursive directory call to purge files and directories * recursive directory call to purge files and directories
* *