pkp#3578: cleaning up strict PHP warnings

UIUCLibrary · May 21, 2018 · 3ca3ca5 · 3ca3ca5
1 parent dfa43c6
commit 3ca3ca5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/classes/controllers/grid/CategoryGridHandler.inc.php b/classes/controllers/grid/CategoryGridHandler.inc.php
@@ -271,7 +271,7 @@ protected function getRowsSequence($request) {
 	/**
 	 * @see GridHandler::doSpecificFetchGridActions($args, $request)
 	 */
-	protected function doSpecificFetchGridActions($args, $request, &$templateMgr) {
+	protected function doSpecificFetchGridActions($args, $request, $templateMgr) {
 		// Render the body elements (category groupings + rows inside a <tbody>)
 		$gridBodyParts = $this->_renderCategoriesInternally($request);
 		$templateMgr->assign('gridBodyParts', $gridBodyParts);

diff --git a/classes/controllers/grid/plugins/PluginGridHandler.inc.php b/classes/controllers/grid/plugins/PluginGridHandler.inc.php
@@ -39,7 +39,7 @@ function __construct($roles) {
 	/**
 	 * @copydoc GridHandler::initialize()
 	 */
-	function initialize($request) {
+	function initialize($request, $args = null) {
 		parent::initialize($request);
 
 		// Load language components
@@ -151,7 +151,7 @@ protected function getCategoryRowInstance() {
 	/**
 	 * @copydoc CategoryGridHandler::loadCategoryData()
 	 */
-	function loadCategoryData($request, &$categoryDataElement, $filter) {
+	function loadCategoryData($request, &$categoryDataElement, $filter = null) {
 		$plugins =& PluginRegistry::loadCategory($categoryDataElement);
 
 		$versionDao = DAORegistry::getDAO('VersionDAO');

diff --git a/controllers/grid/plugins/form/UploadPluginForm.inc.php b/controllers/grid/plugins/form/UploadPluginForm.inc.php
@@ -50,7 +50,7 @@ function readInputData() {
 	/**
 	 * @copydoc Form::fetch()
 	 */
-	function fetch($request) {
+	function fetch($request, $template = null, $display = false) {
 		$templateMgr = TemplateManager::getManager($request);
 		$templateMgr->assign(array(
 			'function' => $this->_function,
@@ -64,10 +64,12 @@ function fetch($request) {
 	/**
 	 * @copydoc Form::execute()
 	 */
-	function execute($request) {
-		parent::execute($request);
+	function execute() {
+		parent::execute();
 
 		// Retrieve the temporary file.
+		$application = PKPApplication::getApplication();
+		$request = $application->getRequest();
 		$user = $request->getUser();
 		$temporaryFileId = $this->getData('temporaryFileId');
 		$temporaryFileDao = DAORegistry::getDAO('TemporaryFileDAO');