From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sun, 18 Aug 2013 17:06:45 +0000 (+0200)
Subject: [TASK] Merge pagegen.php to index_ts.php
X-Git-Tag: TYPO3_6-2-0alpha3~206
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/eb14812601a6f60d42faba0f94ee204632e87d94

[TASK] Merge pagegen.php to index_ts.php

pagegen.php contains rendering code and is called twice
in index_ts.php. The patch merged the content of this
file to index_ts.php to have all global code in one file.

The patch is a straight forward refactoring, only the
time tracking is a bit simplified and an obsolete if
is removed at the former second inclusion of the file.

Change-Id: Id8477423455281bd6df2ce32eb280809045e4541
Resolves: #51254
Releases: 6.2
Reviewed-on: https://review.typo3.org/23246
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
---

diff --git a/typo3/sysext/cms/tslib/index_ts.php b/typo3/sysext/cms/tslib/index_ts.php
index 5641d38e62ac..286ec2f8dcf1 100644
--- a/typo3/sysext/cms/tslib/index_ts.php
+++ b/typo3/sysext/cms/tslib/index_ts.php
@@ -180,6 +180,7 @@ $TSFE->handleDataSubmission();
 
 // Check for shortcut page and redirect
 $TSFE->checkPageForShortcutRedirect();
+
 // Generate page
 $TSFE->setUrlIdToken();
 $TT->push('Page generation', '');
@@ -189,13 +190,33 @@ if ($TSFE->isGeneratePage()) {
 	if ($temp_theScript) {
 		include $temp_theScript;
 	} else {
-		include PATH_tslib . 'pagegen.php';
+		\TYPO3\CMS\Frontend\Page\PageGenerator::pagegenInit();
+		// Global content object
+		$TSFE->newCObj();
+		// LIBRARY INCLUSION, TypoScript
+		$temp_incFiles = \TYPO3\CMS\Frontend\Page\PageGenerator::getIncFiles();
+		foreach ($temp_incFiles as $temp_file) {
+			include_once './' . $temp_file;
+		}
+		// Content generation
+		if (!$TSFE->isINTincScript()) {
+			\TYPO3\CMS\Frontend\Page\PageGenerator::renderContent();
+			$TSFE->setAbsRefPrefix();
+		}
 	}
 	$TSFE->generatePage_postProcessing();
 } elseif ($TSFE->isINTincScript()) {
-	include PATH_tslib . 'pagegen.php';
+	\TYPO3\CMS\Frontend\Page\PageGenerator::pagegenInit();
+	// Global content object
+	$TSFE->newCObj();
+	// LIBRARY INCLUSION, TypoScript
+	$temp_incFiles = \TYPO3\CMS\Frontend\Page\PageGenerator::getIncFiles();
+	foreach ($temp_incFiles as $temp_file) {
+		include_once './' . $temp_file;
+	}
 }
 $TT->pull();
+
 // $TSFE->config['INTincScript']
 if ($TSFE->isINTincScript()) {
 	$TT->push('Non-cached objects', '');
diff --git a/typo3/sysext/cms/tslib/pagegen.php b/typo3/sysext/cms/tslib/pagegen.php
deleted file mode 100644
index cb7c6f1e59a1..000000000000
--- a/typo3/sysext/cms/tslib/pagegen.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2013 Kasper Skårhøj (kasperYYYY@typo3.com)
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Generating the TypoScript based page.
- * Must be included from index_ts.php
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-if (!is_object($TSFE)) {
-	die('You cannot execute this file directly. It\'s meant to be included from index_ts.php');
-}
-$TT->push('pagegen.php, initialize');
-// Initialization of some variables
-\TYPO3\CMS\Frontend\Page\PageGenerator::pagegenInit();
-// Global content object...
-$GLOBALS['TSFE']->newCObj();
-// LIBRARY INCLUSION, TypoScript
-$temp_incFiles = \TYPO3\CMS\Frontend\Page\PageGenerator::getIncFiles();
-foreach ($temp_incFiles as $temp_file) {
-	include_once './' . $temp_file;
-}
-$TT->pull();
-// Content generation
-// If this is an array, it's a sign that this script is included in order to include certain INT-scripts
-if (!$GLOBALS['TSFE']->isINTincScript()) {
-	$TT->push('pagegen.php, render');
-	\TYPO3\CMS\Frontend\Page\PageGenerator::renderContent();
-	$GLOBALS['TSFE']->setAbsRefPrefix();
-	$TT->pull();
-}
-?>
\ No newline at end of file