Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove files that are still there after an upgrade from 2.5 to 3.x #6402

Merged
merged 2 commits into from
Mar 14, 2015
Merged

Remove files that are still there after an upgrade from 2.5 to 3.x #6402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ebb9f3
Update script.php
zero-24 Mar 12, 2015
400bb86
Update script.php
zero-24 Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
109 changes: 108 additions & 1 deletion administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ class JoomlaInstallerScript
*/
public function update($installer)
{
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';

JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');

Expand Down Expand Up @@ -1160,6 +1161,108 @@ public function deleteUnexistingFiles()
'/media/editors/codemirror/js/php.js',
'/media/editors/codemirror/js/xml-fold.js',
'/media/editors/codemirror/js/xml.js',
// Joomla! 3.4.1
'/libraries/joomla/environment/request.php',
'/media/editors/tinymce/templates/template_list.js',
'/administrator/help/en-GB/Components_Banners_Banners.html',
'/administrator/help/en-GB/Components_Banners_Banners_Edit.html',
'/administrator/help/en-GB/Components_Banners_Categories.html',
'/administrator/help/en-GB/Components_Banners_Category_Edit.html',
'/administrator/help/en-GB/Components_Banners_Clients.html',
'/administrator/help/en-GB/Components_Banners_Clients_Edit.html',
'/administrator/help/en-GB/Components_Banners_Tracks.html',
'/administrator/help/en-GB/Components_Contact_Categories.html',
'/administrator/help/en-GB/Components_Contact_Category_Edit.html',
'/administrator/help/en-GB/Components_Contacts_Contacts.html',
'/administrator/help/en-GB/Components_Contacts_Contacts_Edit.html',
'/administrator/help/en-GB/Components_Content_Categories.html',
'/administrator/help/en-GB/Components_Content_Category_Edit.html',
'/administrator/help/en-GB/Components_Messaging_Inbox.html',
'/administrator/help/en-GB/Components_Messaging_Read.html',
'/administrator/help/en-GB/Components_Messaging_Write.html',
'/administrator/help/en-GB/Components_Newsfeeds_Categories.html',
'/administrator/help/en-GB/Components_Newsfeeds_Category_Edit.html',
'/administrator/help/en-GB/Components_Newsfeeds_Feeds.html',
'/administrator/help/en-GB/Components_Newsfeeds_Feeds_Edit.html',
'/administrator/help/en-GB/Components_Redirect_Manager.html',
'/administrator/help/en-GB/Components_Redirect_Manager_Edit.html',
'/administrator/help/en-GB/Components_Search.html',
'/administrator/help/en-GB/Components_Weblinks_Categories.html',
'/administrator/help/en-GB/Components_Weblinks_Category_Edit.html',
'/administrator/help/en-GB/Components_Weblinks_Links.html',
'/administrator/help/en-GB/Components_Weblinks_Links_Edit.html',
'/administrator/help/en-GB/Content_Article_Manager.html',
'/administrator/help/en-GB/Content_Article_Manager_Edit.html',
'/administrator/help/en-GB/Content_Featured_Articles.html',
'/administrator/help/en-GB/Content_Media_Manager.html',
'/administrator/help/en-GB/Extensions_Extension_Manager_Discover.html',
'/administrator/help/en-GB/Extensions_Extension_Manager_Install.html',
'/administrator/help/en-GB/Extensions_Extension_Manager_Manage.html',
'/administrator/help/en-GB/Extensions_Extension_Manager_Update.html',
'/administrator/help/en-GB/Extensions_Extension_Manager_Warnings.html',
'/administrator/help/en-GB/Extensions_Language_Manager_Content.html',
'/administrator/help/en-GB/Extensions_Language_Manager_Edit.html',
'/administrator/help/en-GB/Extensions_Language_Manager_Installed.html',
'/administrator/help/en-GB/Extensions_Module_Manager.html',
'/administrator/help/en-GB/Extensions_Module_Manager_Edit.html',
'/administrator/help/en-GB/Extensions_Plugin_Manager.html',
'/administrator/help/en-GB/Extensions_Plugin_Manager_Edit.html',
'/administrator/help/en-GB/Extensions_Template_Manager_Styles.html',
'/administrator/help/en-GB/Extensions_Template_Manager_Styles_Edit.html',
'/administrator/help/en-GB/Extensions_Template_Manager_Templates.html',
'/administrator/help/en-GB/Extensions_Template_Manager_Templates_Edit.html',
'/administrator/help/en-GB/Extensions_Template_Manager_Templates_Edit_Source.html',
'/administrator/help/en-GB/Glossary.html',
'/administrator/help/en-GB/Menus_Menu_Item_Manager.html',
'/administrator/help/en-GB/Menus_Menu_Item_Manager_Edit.html',
'/administrator/help/en-GB/Menus_Menu_Manager.html',
'/administrator/help/en-GB/Menus_Menu_Manager_Edit.html',
'/administrator/help/en-GB/Site_Global_Configuration.html',
'/administrator/help/en-GB/Site_Maintenance_Clear_Cache.html',
'/administrator/help/en-GB/Site_Maintenance_Global_Check-in.html',
'/administrator/help/en-GB/Site_Maintenance_Purge_Expired_Cache.html',
'/administrator/help/en-GB/Site_System_Information.html',
'/administrator/help/en-GB/Start_Here.html',
'/administrator/help/en-GB/Users_Access_Levels.html',
'/administrator/help/en-GB/Users_Access_Levels_Edit.html',
'/administrator/help/en-GB/Users_Debug_Users.html',
'/administrator/help/en-GB/Users_Groups.html',
'/administrator/help/en-GB/Users_Groups_Edit.html',
'/administrator/help/en-GB/Users_Mass_Mail_Users.html',
'/administrator/help/en-GB/Users_User_Manager.html',
'/administrator/help/en-GB/Users_User_Manager_Edit.html',
'/administrator/components/com_config/views/index.html',
'/administrator/components/com_config/views/application/index.html',
'/administrator/components/com_config/views/application/view.html.php',
'/administrator/components/com_config/views/application/tmpl/default.php',
'/administrator/components/com_config/views/application/tmpl/default_cache.php',
'/administrator/components/com_config/views/application/tmpl/default_cookie.php',
'/administrator/components/com_config/views/application/tmpl/default_database.php',
'/administrator/components/com_config/views/application/tmpl/default_debug.php',
'/administrator/components/com_config/views/application/tmpl/default_filters.php',
'/administrator/components/com_config/views/application/tmpl/default_ftp.php',
'/administrator/components/com_config/views/application/tmpl/default_ftplogin.php',
'/administrator/components/com_config/views/application/tmpl/default_locale.php',
'/administrator/components/com_config/views/application/tmpl/default_mail.php',
'/administrator/components/com_config/views/application/tmpl/default_metadata.php',
'/administrator/components/com_config/views/application/tmpl/default_navigation.php',
'/administrator/components/com_config/views/application/tmpl/default_permissions.php',
'/administrator/components/com_config/views/application/tmpl/default_seo.php',
'/administrator/components/com_config/views/application/tmpl/default_server.php',
'/administrator/components/com_config/views/application/tmpl/default_session.php',
'/administrator/components/com_config/views/application/tmpl/default_site.php',
'/administrator/components/com_config/views/application/tmpl/default_system.php',
'/administrator/components/com_config/views/application/tmpl/index.html',
'/administrator/components/com_config/views/close/index.html',
'/administrator/components/com_config/views/close/view.html.php',
'/administrator/components/com_config/views/component/index.html',
'/administrator/components/com_config/views/component/view.html.php',
'/administrator/components/com_config/views/component/tmpl/default.php',
'/administrator/components/com_config/views/component/tmpl/index.html',
'/administrator/components/com_config/models/fields/filters.php',
'/administrator/components/com_config/models/fields/index.html',
'/administrator/components/com_config/models/forms/application.xml',
'/administrator/components/com_config/models/forms/index.html',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1241,6 +1344,10 @@ public function deleteUnexistingFiles()
'/libraries/phpmailer',
'/media/editors/codemirror/css',
'/media/editors/codemirror/js',
// Joomla! 3.4.1
'/administrator/components/com_config/views',
'/administrator/components/com_config/models/fields',
'/administrator/components/com_config/models/forms',
);

jimport('joomla.filesystem.file');
Expand Down