From d63bca9d3cf7f40442bb244e52b8a44166e736b8 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 9 Jul 2015 14:22:22 +0200 Subject: [PATCH] Rss10Action now in an autodetected file. --- actions/allrss.php | 6 +----- actions/grouprss.php | 6 +----- actions/noticesearchrss.php | 6 +----- actions/publicrss.php | 6 +----- actions/repliesrss.php | 4 +--- actions/tagrss.php | 4 +--- actions/userrss.php | 2 -- lib/{rssaction.php => rss10action.php} | 0 plugins/Bookmark/actions/bookmarksrss.php | 6 +----- plugins/Favorite/actions/favoritesrss.php | 6 +----- 10 files changed, 8 insertions(+), 38 deletions(-) rename lib/{rssaction.php => rss10action.php} (100%) diff --git a/actions/allrss.php b/actions/allrss.php index fee52c79ab..d311701a57 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -28,11 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * RSS feed for user and friends timeline. diff --git a/actions/grouprss.php b/actions/grouprss.php index 87e34d73f8..dca323ad73 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -28,11 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } define('MEMBERS_PER_SECTION', 27); diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php index 14c280f62c..2ecdd547fb 100644 --- a/actions/noticesearchrss.php +++ b/actions/noticesearchrss.php @@ -28,11 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * RSS feed for notice search action class. diff --git a/actions/publicrss.php b/actions/publicrss.php index 11db3b37a4..7ad665e282 100644 --- a/actions/publicrss.php +++ b/actions/publicrss.php @@ -28,11 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * RSS feed for public timeline. diff --git a/actions/repliesrss.php b/actions/repliesrss.php index 145b51aaea..4e9af1e9ff 100644 --- a/actions/repliesrss.php +++ b/actions/repliesrss.php @@ -17,9 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -require_once(INSTALLDIR.'/lib/rssaction.php'); +if (!defined('GNUSOCIAL')) { exit(1); } // Formatting of RSS handled by Rss10Action diff --git a/actions/tagrss.php b/actions/tagrss.php index 8a1494f131..66eb77c271 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -17,9 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -require_once(INSTALLDIR.'/lib/rssaction.php'); +if (!defined('GNUSOCIAL')) { exit(1); } // Formatting of RSS handled by Rss10Action class TagrssAction extends Rss10Action diff --git a/actions/userrss.php b/actions/userrss.php index fe4ae155a3..aae41ee504 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -19,8 +19,6 @@ if (!defined('GNUSOCIAL')) { exit(1); } -require_once(INSTALLDIR.'/lib/rssaction.php'); - // Formatting of RSS handled by Rss10Action class UserrssAction extends Rss10Action diff --git a/lib/rssaction.php b/lib/rss10action.php similarity index 100% rename from lib/rssaction.php rename to lib/rss10action.php diff --git a/plugins/Bookmark/actions/bookmarksrss.php b/plugins/Bookmark/actions/bookmarksrss.php index fc3331482f..1f2baa17d4 100644 --- a/plugins/Bookmark/actions/bookmarksrss.php +++ b/plugins/Bookmark/actions/bookmarksrss.php @@ -28,11 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * RSS feed for user bookmarks action class. diff --git a/plugins/Favorite/actions/favoritesrss.php b/plugins/Favorite/actions/favoritesrss.php index 0cbebd723c..b532e0bf31 100644 --- a/plugins/Favorite/actions/favoritesrss.php +++ b/plugins/Favorite/actions/favoritesrss.php @@ -28,11 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/rssaction.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * RSS feed for user favorites action class. -- 2.39.5