Merge pull request pkp#2259 from NateWr/i3691_master

pkp/pkp-lib#3691 Move default html galley styles from hook to method
NateWr · Feb 7, 2019 · 362857e · 362857e
2 parents eceeeb4 + 6e9c637
commit 362857e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/plugins/generic/htmlArticleGalley/HtmlArticleGalleyPlugin.inc.php b/plugins/generic/htmlArticleGalley/HtmlArticleGalleyPlugin.inc.php
@@ -163,6 +163,9 @@ function _getHTMLContents($request, $galley) {
 			$contents
 		);
 
+		$templateMgr = TemplateManager::getManager($request);
+		$contents = $templateMgr->loadHtmlGalleyStyles($contents, $embeddableFiles);
+
 		// Perform variable replacement for journal, issue, site info
 		$issueDao = DAORegistry::getDAO('IssueDAO');
 		$issue = $issueDao->getByArticleId($galley->getSubmissionId());
@@ -180,8 +183,6 @@ function _getHTMLContents($request, $galley) {
 		foreach ($paramArray as $key => $value) {
 			$contents = str_replace('{$' . $key . '}', $value, $contents);
 		}
-
-		HookRegistry::call('HtmlArticleGalleyPlugin::htmlGalleyContent', array($galley, &$contents, $submissionFile, $embeddableFiles));
 
 		return $contents;
 	}
@@ -258,5 +259,3 @@ function _handleOjsUrl($matchArray) {
 		return $matchArray[1] . $url . $matchArray[3];
 	}
 }
-
-