pkp/pkp-lib#3242 Fix plugin template name references

asmecher · Jun 7, 2018 · d8b7e84 · d8b7e84
1 parent 9f95d16
commit d8b7e84
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 58 deletions.
diff --git a/plugins/generic/htmlMonographFile/HtmlMonographFilePlugin.inc.php b/plugins/generic/htmlMonographFile/HtmlMonographFilePlugin.inc.php
@@ -54,13 +54,6 @@ function getDescription() {
 		return __('plugins.generic.htmlMonographFile.description');
 	}
 
-	/**
-	 * @copydoc Plugin::getTemplatePath()
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':';
-	}
-
 	/**
 	 * Callback to view the HTML content rather than downloading.
 	 * @param $hookName string

diff --git a/plugins/generic/pdfJsViewer/PdfJsViewerPlugin.inc.php b/plugins/generic/pdfJsViewer/PdfJsViewerPlugin.inc.php
@@ -39,13 +39,6 @@ function getContextSpecificPluginSettingsFile() {
 		return $this->getPluginPath() . '/settings.xml';
 	}
 
-	/**
-	 * @copydoc PKPPlugin::getTemplatePath
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':templates/';
-	}
-
 	/**
 	 * Get the display name of this plugin.
 	 * @return String

diff --git a/plugins/importexport/native/NativeImportExportPlugin.inc.php b/plugins/importexport/native/NativeImportExportPlugin.inc.php
@@ -37,13 +37,6 @@ function register($category, $path, $mainContextId = null) {
 		return $success;
 	}
 
-	/**
-	 * @see Plugin::getTemplatePath($inCore)
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':templates/';
-	}
-
 	/**
 	 * Get the name of this plugin. The name must be unique within
 	 * its category.
@@ -100,7 +93,7 @@ function display($args, $request) {
 					'lazyLoad' => true,
 				));
 				$templateMgr->assign('exportSubmissionsListData', json_encode($exportSubmissionsListHandler->getConfig()));
-				$templateMgr->display($this->getTemplateResourceName() . ':index.tpl');
+				$templateMgr->display($this->getTemplateResource('index.tpl'));
 				break;
 			case 'uploadImportXML':
 				$user = $request->getUser();
@@ -164,7 +157,7 @@ function display($args, $request) {
 					$deployment->removeImportedObjects(ASSOC_TYPE_SUBMISSION);
 				}
 				// Display the results
-				$json = new JSONMessage(true, $templateMgr->fetch($this->getTemplateResourceNamePath() . ':results.tpl'));
+				$json = new JSONMessage(true, $templateMgr->fetch($this->getTemplateResource('results.tpl')));
 				return $json->getString();
 			case 'export':
 				$exportXml = $this->exportSubmissions(

diff --git a/plugins/importexport/onix30/Onix30ExportPlugin.inc.php b/plugins/importexport/onix30/Onix30ExportPlugin.inc.php
@@ -37,13 +37,6 @@ function register($category, $path, $mainContextId = null) {
 		return $success;
 	}
 
-	/**
-	 * @see Plugin::getTemplatePath($inCore)
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':templates/';
-	}
-
 	/**
 	 * Get the name of this plugin. The name must be unique within
 	 * its category.

diff --git a/plugins/paymethod/manual/ManualPaymentPlugin.inc.php b/plugins/paymethod/manual/ManualPaymentPlugin.inc.php
@@ -153,11 +153,4 @@ function getInstallEmailTemplatesFile() {
 	function getInstallEmailTemplateDataFile() {
 		return ($this->getPluginPath() . '/locale/{$installedLocale}/emailTemplates.xml');
 	}
-
-	/**
-	 * @copydoc Plugin::getTemplatePath()
-	 */
-	function getTemplatePath($inCore = false) {
-		return parent::getTemplatePath($inCore) . 'templates/';
-	}
 }
diff --git a/plugins/paymethod/paypal/PaypalPaymentPlugin.inc.php b/plugins/paymethod/paypal/PaypalPaymentPlugin.inc.php
@@ -132,13 +132,6 @@ function getInstallEmailTemplatesFile() {
 	function getInstallEmailTemplateDataFile() {
 		return ($this->getPluginPath() . '/locale/{$installedLocale}/emailTemplates.xml');
 	}
-
-	/**
-	 * @copydoc Plugin::getTemplatePath()
-	 */
-	function getTemplatePath($inCore = false) {
-		return parent::getTemplatePath($inCore) . 'templates/';
-	}
 }
 
 ?>
diff --git a/plugins/pubIds/doi/DOIPubIdPlugin.inc.php b/plugins/pubIds/doi/DOIPubIdPlugin.inc.php
@@ -49,13 +49,6 @@ function getDescription() {
 		return __('plugins.pubIds.doi.description');
 	}
 
-	/**
-	 * @copydoc Plugin::getTemplatePath()
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':templates/';
-	}
-
 
 	//
 	// Implement template methods from PubIdPlugin.

diff --git a/plugins/pubIds/urn/URNPubIdPlugin.inc.php b/plugins/pubIds/urn/URNPubIdPlugin.inc.php
@@ -48,13 +48,6 @@ function getDescription() {
 		return __('plugins.pubIds.urn.description');
 	}
 
-	/**
-	 * @copydoc Plugin::getTemplatePath()
-	 */
-	function getTemplatePath($inCore = false) {
-		return $this->getTemplateResourceName() . ':templates/';
-	}
-
 
 	//
 	// Implement template methods from PubIdPlugin.