Support 3.1.2 release

ajnyga · Mar 5, 2019 · 72099d7 · 72099d7
1 parent cb418fd
commit 72099d7
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 30 deletions.
diff --git a/AllowedUploadsPlugin.inc.php b/AllowedUploadsPlugin.inc.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/generic/allowedUploads/AllowedUploadsPlugin.inc.php
  *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2014-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class AllowedUploadsPlugin
@@ -22,7 +22,7 @@ class AllowedUploadsPlugin extends GenericPlugin {
 	 * @return boolean True iff plugin initialized successfully; if false,
 	 * 	the plugin will not be registered.
 	 */
-	function register($category, $path) {
+	function register($category, $path, $mainContextId = null) {
 		$success = parent::register($category, $path);
 		if (!Config::getVar('general', 'installed') || defined('RUNNING_UPGRADE')) return true;
 		if ($success && $this->getEnabled()) {
@@ -100,13 +100,6 @@ function manage($args, $request) {
 		return parent::manage($args, $request);
 	}
 
-	/**
-	 * @copydoc PKPPlugin::getTemplatePath
-	 */
-	function getTemplatePath($inCore = false) {
-		return parent::getTemplatePath($inCore) . 'templates/';
-	}
-
 	/**
 	 * Check the uploaded file
 	 */

diff --git a/AllowedUploadsSettingsForm.inc.php b/AllowedUploadsSettingsForm.inc.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/generic/allowedUploads/AllowedUploadsSettingsForm.inc.php
  *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2014-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class AllowedUploadsSettingsForm
@@ -32,7 +32,7 @@ function __construct($plugin, $contextId) {
 		$this->_contextId = $contextId;
 		$this->_plugin = $plugin;
 
-		parent::__construct($plugin->getTemplatePath() . 'settingsForm.tpl');
+		parent::__construct($plugin->getTemplateResource('settingsForm.tpl'));
 
 		$this->addCheck(new FormValidatorPost($this));
 		$this->addCheck(new FormValidatorCSRF($this));
@@ -58,10 +58,10 @@ function readInputData() {
 	 * Fetch the form.
 	 * @copydoc Form::fetch()
 	 */
-	function fetch($request) {
+	function fetch($request, $template = null, $display = false) {
 		$templateMgr = TemplateManager::getManager($request);
 		$templateMgr->assign('pluginName', $this->_plugin->getName());
-		return parent::fetch($request);
+		return parent::fetch($request, $template, $display);
 	}
 
 	/**

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Allowed Uploads
 ===============
 
-For OJS/OMP 3.1.1.2 or higher
+For OJS/OMP 3.1.2 or higher
 
 The plugin enables the editor to choose which file extensions are allowed in their journal. NOTE! This is *not* a security plugin. Make sure that your files directory is not a subdirectory of your OJS installation. For more details read the OJS installation instructions.
 

diff --git a/index.php b/index.php
@@ -7,8 +7,8 @@
 /**
  * @file plugins/generic/allowedUploads/index.php
  *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2014-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @ingroup plugins_generic_allowedUploads

diff --git a/locale/ar_IQ/locale.xml b/locale/ar_IQ/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * plugins/generic/allowedUploads/locale/ar_IQ/locale.xml
   *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2014-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Allowed Uploads plugin localization strings

diff --git a/locale/en_US/locale.xml b/locale/en_US/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * plugins/generic/allowedUploads/locale/en_US/locale.xml
   *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2014-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Allowed Uploads plugin localization strings

diff --git a/locale/fi_FI/locale.xml b/locale/fi_FI/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * plugins/generic/allowedUploads/locale/fi_FI/locale.xml
   *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2014-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Allowed Uploads plugin localization strings

diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl
@@ -1,8 +1,8 @@
 {**
  * plugins/generic/allowedUploads/settingsForm.tpl
  *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2014-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * Allowed Uploads plugin settings

diff --git a/version.xml b/version.xml
@@ -4,17 +4,17 @@
 <!--
   * plugins/generic/allowedUploads/version.xml
   *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2014-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Plugin version information.
   -->
 <version>
 	<application>allowedUploads</application>
 	<type>plugins.generic</type>
-	<release>1.0.0.2</release>
-	<date>2018-07-27</date>
+	<release>1.0.0.3</release>
+	<date>2019-03-05</date>
 	<lazy-load>1</lazy-load>
 	<class>AllowedUploadsPlugin</class>
 </version>