Skip to content
This repository has been archived by the owner on Feb 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #39 from nooku/feature/38-simplepie
Browse files Browse the repository at this point in the history
Remove SimplePie library
  • Loading branch information
johanjanssens committed May 25, 2015
2 parents 8cd5162 + ea21a93 commit 103eb5b
Show file tree
Hide file tree
Showing 22 changed files with 3 additions and 16,793 deletions.
1 change: 0 additions & 1 deletion administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ protected function updateManifestCaches()

// Libraries
$extensions[] = array('library', 'phpmailer', '', 0);
$extensions[] = array('library', 'simplepie', '', 0);
$extensions[] = array('library', 'phputf8', '', 0);
$extensions[] = array('library', 'joomla', '', 0);
$extensions[] = array('library', 'idna_convert', '', 0);
Expand Down
18 changes: 0 additions & 18 deletions administrator/manifests/libraries/simplepie.xml

This file was deleted.

1 change: 0 additions & 1 deletion build/phpcs/Joomla/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<exclude-pattern type="relative">libraries/framework/*</exclude-pattern>
<exclude-pattern type="relative">libraries/idna_convert/*</exclude-pattern>
<exclude-pattern type="relative">libraries/phputf8/*</exclude-pattern>
<exclude-pattern type="relative">libraries/simplepie/*</exclude-pattern>
<exclude-pattern type="relative">libraries/phpmailer/*</exclude-pattern>
<exclude-pattern type="relative">libraries/phpass/*</exclude-pattern>

Expand Down
8 changes: 1 addition & 7 deletions installation/CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Mongolian (mn-MN) - Mongolian Translation Team, Altansukh T.
Norwegian Bokmål (nb-NO) - Joomla! i Norge - Rune Rasmussen, Roar Jystad, Jens-Christian Skibakk
Norwegian Nynorsk (nn-NO) - Joomla! i Norge - Toyni Tobekk (based on nb-NO translations)
Persian (fa-IR) - Persian Translation Team - Mohsen Firoozmandan, Joomla Farsi Team
Polish (pl-PL) - Polskie Centrum Joomla!
Polish (pl-PL) - Polskie Centrum Joomla!
Portuguese (pt-BR) - Joomla! Brasil
Portuguese (pt-PT) - Comunidade Joomla! Portugal - Paulo Izidoro
Romanian (ro-RO) - Romanian Joomla! Community - Horia Negura, Lavinia Negura
Expand Down Expand Up @@ -436,12 +436,6 @@ Author: Edd Dumbill
Copyright: Copyright (C) 1999,2000,2002 Edd Dumbill
License: BSD License

SimplePie
---------
Author: Ryan Parman and Geoffrey Sneddon
Copyright: Copyright (C) 2004-2007, Ryan Parman and Geoffrey Sneddon
License: BSD License

TCPDF
-----
Author: Nicola Asuni
Expand Down
1 change: 0 additions & 1 deletion installation/sql/mysql/joomla.sql
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '', '{"tag_layout":"_:default","save_history":"1","history_limit":5,"show_tag_title":"0","tag_list_show_tag_image":"0","tag_list_show_tag_description":"0","tag_list_image":"","show_tag_num_items":"0","tag_list_orderby":"title","tag_list_orderby_direction":"ASC","show_headings":"0","tag_list_show_date":"0","tag_list_show_item_image":"0","tag_list_show_item_description":"0","tag_list_item_maximum_characters":0,"return_any_or_all":"1","include_children":"0","maximum":200,"tag_list_language_filter":"all","tags_layout":"_:default","all_tags_orderby":"title","all_tags_orderby_direction":"ASC","all_tags_show_tag_image":"0","all_tags_show_tag_descripion":"0","all_tags_tag_maximum_characters":20,"all_tags_show_tag_hits":"0","filter_field":"1","show_pagination_limit":"1","show_pagination":"2","show_pagination_results":"1","tag_field_ajax_mode":"1","show_feed_link":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(100, 'PHPMailer', 'library', 'phpmailer', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(101, 'SimplePie', 'library', 'simplepie', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
Expand Down
7 changes: 0 additions & 7 deletions language/en-GB/en-GB.lib_simplepie.sys.ini

This file was deleted.

1 change: 0 additions & 1 deletion language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<filename>en-GB.lib_phpass.sys.ini</filename>
<filename>en-GB.lib_phpmailer.sys.ini</filename>
<filename>en-GB.lib_phputf8.sys.ini</filename>
<filename>en-GB.lib_simplepie.sys.ini</filename>
<filename>en-GB.localise.php</filename>
<filename>en-GB.mod_articles_archive.ini</filename>
<filename>en-GB.mod_articles_archive.sys.ini</filename>
Expand Down
10 changes: 2 additions & 8 deletions libraries/joomla/factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -358,22 +358,16 @@ public static function getMailer()
* @param string $url Url for feed source.
* @param integer $cache_time Time to cache feed for (using internal cache mechanism).
*
* @return mixed SimplePie parsed object on success, false on failure.
*
* @since 11.1
* @throws BadMethodCallException
* @deprecated 4.0 Use directly JFeedFactory or supply SimplePie instead. Mehod will be proxied to JFeedFactory beginning in 3.2
* @deprecated Use directly JFeedFactory.
*/
public static function getFeedParser($url, $cache_time = 0)
{
if (!class_exists('JSimplepieFactory'))
{
throw new BadMethodCallException('JSimplepieFactory not found');
throw new BadMethodCallException(__METHOD__ . ' is deprecated. Use JFeedFactory()');
}

JLog::add(__METHOD__ . ' is deprecated. Use JFeedFactory() or supply SimplePie instead.', JLog::WARNING, 'deprecated');

return JSimplepieFactory::getFeedParser($url, $cache_time);
}

/**
Expand Down
67 changes: 0 additions & 67 deletions libraries/legacy/simplepie/factory.php

This file was deleted.

1 change: 0 additions & 1 deletion libraries/legacy/simplepie/index.html

This file was deleted.

26 changes: 0 additions & 26 deletions libraries/simplepie/LICENSE.txt

This file was deleted.

30 changes: 0 additions & 30 deletions libraries/simplepie/README.txt

This file was deleted.

Loading

0 comments on commit 103eb5b

Please sign in to comment.