remove somplepie

joomla · May 7, 2016 · b617583 · b617583
1 parent e57e635
commit b617583
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -240,8 +240,6 @@ protected function updateManifestCaches()
 			array('component', 'com_postinstall', '', 1),
 
 			// Libraries
-			array('library', 'phpmailer', '', 0),
-			array('library', 'simplepie', '', 0),
 			array('library', 'phputf8', '', 0),
 			array('library', 'joomla', '', 0),
 			array('library', 'idna_convert', '', 0),
@@ -1411,6 +1409,15 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/xml/xml.php',
 			'/administrator/components/com_installer/views/languages/tmpl/default_filter.php',
 			'/administrator/components/com_joomlaupdate/helpers/download.php',
+			// Joomla 3.6.0
+			'libraries/simplepie/README.txt',
+			'libraries/simplepie/simplepie.php',
+			'libraries/simplepie/LICENSE.txt',
+			'libraries/simplepie/idn/LICENCE',
+			'libraries/simplepie/idn/ReadMe.txt',
+			'libraries/simplepie/idn/idna_convert.class.php',
+			'libraries/simplepie/idn/npdata.ser',
+			'administrator/manifests/libraries/simplepie.xml',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -1504,6 +1511,9 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/opensearch',
 			'/libraries/joomla/document/raw',
 			'/libraries/joomla/document/xml',
+			// Joomla 3.6
+			'libraries/simplepie/idn',
+			'libraries/simplepie',
 		);
 
 		jimport('joomla.filesystem.file');