*4205* Request to non-static calls

pkp · Sep 12, 2011 · 0d37bb6 · 0d37bb6
1 parent 43bfa0d
commit 0d37bb6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/pages/announcement/AnnouncementHandler.inc.php b/pages/announcement/AnnouncementHandler.inc.php
@@ -27,16 +27,16 @@ function AnnouncementHandler() {
 	/**
 	 * @see PKPAnnouncementHandler::_getAnnouncementsEnabled()
 	 */
-	function _getAnnouncementsEnabled() {
-		$journal =& Request::getJournal();
+	function _getAnnouncementsEnabled($request) {
+		$journal =& $request->getJournal();
 		return $journal->getSetting('enableAnnouncements');
 	}
 
 	/**
 	 * @see PKPAnnouncementHandler::_getAnnouncements()
 	 */
-	function &_getAnnouncements($rangeInfo = null) {
-		$journal =& Request::getJournal();
+	function &_getAnnouncements($request, $rangeInfo = null) {
+		$journal =& $request->getJournal();
 
 		$announcementDao =& DAORegistry::getDAO('AnnouncementDAO');
 		$announcements =& $announcementDao->getAnnouncementsNotExpiredByAssocId(ASSOC_TYPE_JOURNAL, $journal->getId(), $rangeInfo);
@@ -47,16 +47,16 @@ function &_getAnnouncements($rangeInfo = null) {
 	/**
 	 * @see PKPAnnouncementHandler::_getAnnouncementsIntroduction()
 	 */
-	function _getAnnouncementsIntroduction() {
-		$journal =& Request::getJournal();
+	function _getAnnouncementsIntroduction($request) {
+		$journal =& $request->getJournal();
 		return $journal->getLocalizedSetting('announcementsIntroduction');
 	}
 
 	/**
 	 * @see PKPAnnouncementHandler::_announcementIsValid()
 	 */
-	function _announcementIsValid($announcementId) {
-		$journal =& Request::getJournal();
+	function _announcementIsValid($request, $announcementId) {
+		$journal =& $request->getJournal();
 		$announcementDao =& DAORegistry::getDAO('AnnouncementDAO');
 		return ($announcementId != null && $announcementDao->getAnnouncementAssocId($announcementId) == $journal->getId());
 	}

diff --git a/pages/manager/AnnouncementHandler.inc.php b/pages/manager/AnnouncementHandler.inc.php
@@ -25,32 +25,40 @@ function AnnouncementHandler() {
 	}
 	/**
 	 * Display a list of announcements for the current journal.
+	 * @see PKPAnnouncementHandler::announcements
 	 */
-	function announcements() {
+	function announcements($args, &$request) {
 		$templateMgr =& TemplateManager::getManager();
 		$templateMgr->assign('helpTopicId', 'journal.managementPages.announcements');
-		parent::announcements();
+		parent::announcements($args, &$request);
 	}
 
 	/**
 	 * Display a list of announcement types for the current journal.
+	 * @see PKPAnnouncementHandler::announcementTypes
 	 */
-	function announcementTypes() {
+	function announcementTypes($args, &$request) {
 		$templateMgr =& TemplateManager::getManager();
 		$templateMgr->assign('helpTopicId', 'journal.managementPages.announcements');
-		parent::announcementTypes();
+		parent::announcementTypes($args, &$request);
 	}
-
-	function &_getAnnouncements($rangeInfo = null) {
-		$journal =& Request::getJournal();
+
+	/**
+	 * @see PKPAnnouncementHandler::_getAnnouncements
+	 */
+	function &_getAnnouncements($request, $rangeInfo = null) {
+		$journal =& $request->getJournal();
 		$announcementDao =& DAORegistry::getDAO('AnnouncementDAO');
 		$announcements =& $announcementDao->getAnnouncementsByAssocId(ASSOC_TYPE_JOURNAL, $journal->getId(), $rangeInfo);
 
 		return $announcements;
 	}
-
-	function &_getAnnouncementTypes($rangeInfo = null) {
-		$journal =& Request::getJournal();
+
+	/**
+	 * @see PKPAnnouncementHandler::_getAnnouncementTypes
+	 */
+	function &_getAnnouncementTypes($request, $rangeInfo = null) {
+		$journal =& $request->getJournal();
 		$announcementTypeDao =& DAORegistry::getDAO('AnnouncementTypeDAO');
 		$announcements =& $announcementTypeDao->getAnnouncementTypesByAssocId(ASSOC_TYPE_JOURNAL, $journal->getId(), $rangeInfo);
 
@@ -59,17 +67,18 @@ function &_getAnnouncementTypes($rangeInfo = null) {
 
 	/**
 	 * Checks the announcement to see if it belongs to this journal or scheduled journal
+	 * @param $request PKPRequest
 	 * @param $announcementId int
 	 * return bool
 	 */	
-	function _announcementIsValid($announcementId) {
+	function _announcementIsValid($request, $announcementId) {
 		if ($announcementId == null) 
 			return true;
 
 		$announcementDao =& DAORegistry::getDAO('AnnouncementDAO');
 		$announcement =& $announcementDao->getAnnouncement($announcementId);
 
-		$journal =& Request::getJournal();
+		$journal =& $request->getJournal();
 		if ( $announcement && $journal 
 			&& $announcement->getAssocType() == ASSOC_TYPE_JOURNAL 
 			&& $announcement->getAssocId() == $journal->getId())
@@ -80,11 +89,12 @@ function _announcementIsValid($announcementId) {
 
 	/**
 	 * Checks the announcement type to see if it belongs to this journal.  All announcement types are set at the journal level.
+	 * @param $request PKPRequest
 	 * @param $typeId int
 	 * return bool
 	 */
-	function _announcementTypeIsValid($typeId) {
-		$journal =& Request::getJournal();
+	function _announcementTypeIsValid($request, $typeId) {
+		$journal =& $request->getJournal();
 		$announcementTypeDao =& DAORegistry::getDAO('AnnouncementTypeDAO');
 		return (($typeId != null && $announcementTypeDao->getAnnouncementTypeAssocId($typeId) == $journal->getId()) || $typeId == null);
 	}