Merge pull request #36 from liayn/fix-35

[BUGFIX] Only use TSFE if it is really there
bithost-gmbh · Feb 6, 2018 · 55999fe · 55999fe
2 parents 6ee423a + 22bc70a
commit 55999fe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Classes/ViewHelpers/DocumentViewHelper.php b/Classes/ViewHelpers/DocumentViewHelper.php
@@ -32,6 +32,7 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use FPDI;
+use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
  * DocumentViewHelper
@@ -72,10 +73,9 @@ public function initializeArguments() {
 	 * @return void
 	 */
 	public function initialize() {
-		if (!isset($GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers'])){
-			$GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers'] = array();
+		if (isset($GLOBALS['TSFE']->applicationData)){
+			$GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers']['pdfOutput'] = true;
 		}
-		$GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers']['pdfOutput'] = true;
 
 		$extPath = ExtensionManagementUtility::extPath('pdfviewhelpers');
 		$pdfClassName = empty($this->settings['config']['class']) ? 'TCPDF' : $this->settings['config']['class'];
@@ -118,7 +118,7 @@ public function initialize() {
 		}
 
 		//Disables cache if set so and in frontend mode
-		if ($GLOBALS['TSFE'] && $this->settings['config']['disableCache']) {
+		if ($GLOBALS['TSFE'] instanceof TypoScriptFrontendController && $this->settings['config']['disableCache']) {
 			$GLOBALS['TSFE']->set_no_cache();
 		}
 	}