*7956* Fixed Announcement/WebFeed injection with component requests

pkp · Oct 6, 2012 · 814f647 · 814f647
1 parent 56cc7bc
commit 814f647
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/generic/announcementFeed/AnnouncementFeedPlugin.inc.php b/plugins/generic/announcementFeed/AnnouncementFeedPlugin.inc.php
@@ -67,9 +67,9 @@ function callbackLoadCategory($hookName, $args) {
 	}
 
 	function callbackAddLinks($hookName, $args) {
-		if ($this->getEnabled()) {
+		$request =& $this->getRequest();
+		if ($this->getEnabled() && is_a($request->getRouter(), 'PKPPageRouter')) {
 			$templateManager =& $args[0];
-			$request =& $this->getRequest();
 			$currentJournal =& $templateManager->get_template_vars('currentJournal');
 			$announcementsEnabled = $currentJournal ? $currentJournal->getSetting('enableAnnouncements') : false;
 			$displayPage = $currentJournal ? $this->getSetting($currentJournal->getId(), 'displayPage') : null;

diff --git a/plugins/generic/thesisFeed/ThesisFeedPlugin.inc.php b/plugins/generic/thesisFeed/ThesisFeedPlugin.inc.php
@@ -67,7 +67,8 @@ function callbackLoadCategory($hookName, $args) {
 	}
 
 	function callbackAddLinks($hookName, $args) {
-		if ($this->getEnabled()) {
+		$request =& $this->getRequest();
+		if ($this->getEnabled() && is_a($request->getRouter(), 'PKPPageRouter')) {
 			$templateManager =& $args[0];
 			$currentJournal =& $templateManager->get_template_vars('currentJournal');