Permalink
Browse files

[#28325] Deleted files not being deleted during version update

  • Loading branch information...
1 parent ebd9e84 commit fc58b5043a391912d91b3274f1aa6ea5af153779 @dextercowley dextercowley committed Mar 30, 2012
Showing with 49 additions and 1 deletion.
  1. +45 −0 administrator/components/com_admin/script.php
  2. +3 −1 build/build.php
  3. +1 −0 installation/CHANGELOG
@@ -328,6 +328,50 @@ public function deleteUnexistingFiles()
'/libraries/phpmailer/language/phpmailer.lang-en.php',
'/media/system/css/modal_msie.css',
'/media/system/images/modal/closebox.gif',
+ '/administrator/components/com_admin/sql/updates/sqlsrv/2.5.2-2012-03-05.sql',
+ '/administrator/components/com_admin/sql/updates/sqlsrv/2.5.3-2012-03-13.sql',
+ '/administrator/components/com_admin/sql/updates/sqlsrv/index.html',
+ '/administrator/language/en-GB/en-GB.plg_system_finder.ini',
+ '/administrator/language/en-GB/en-GB.plg_system_finder.sys.ini',
+ '/libraries/joomla/form/fields/templatestyle.php',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js',
+ '/media/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js',
);
// TODO There is an issue while deleting folders using the ftp mode
@@ -336,6 +380,7 @@ public function deleteUnexistingFiles()
'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img',
'/media/plg_highlight',
'/media/mod_finder_status',
+ '/administrator/components/com_admin/sql/updates/sqlsrv',
);
foreach ($files as $file) {
View
@@ -86,15 +86,17 @@
// Loop through and add all files except: tests, installation, build, .git, or docs
foreach($files AS $file)
{
- if(substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($rawfile,2,5) != 'build'
+ if(substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file,2,5) != 'build'
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' )
{
+ // Don't add deleted files to the list
if (substr($file, 0, 1) != 'D')
{
$newfile[] = substr($file, 2);
}
else
{
+ // Add deleted files to the deleted files list
$deletedFiles[] = substr($file,2);
}
}
@@ -31,6 +31,7 @@ $ -> Language fix or change
30-Mar-2012 Mark Dexter
# Sample data fixes for SQL Server
# [#28316] Incorrect ordering value if editing last module
+ # [#28325] Deleted files not being deleted during version update
29-Mar-2012 Mark Dexter
# [#28323] com_joomlaupdate does not delete joomla.xml file in root folder

0 comments on commit fc58b50

Please sign in to comment.