From: Tim Düsterhus <timwolla@arcor.de>
Date: Tue, 8 Nov 2011 17:36:26 +0000 (+0100)
Subject: Optimizing TemplateScriptingCompiler: Output Buffering
X-Git-Tag: 2.0.0_Beta_1~1484^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=21bf6c612f6da89396a1941adf184a78360645ed;p=GitHub%2FWoltLab%2FWCF.git

Optimizing TemplateScriptingCompiler: Output Buffering

Shortening ob_get_contents(); ob_end_clean(); to ob_get_clean();
> ob_get_clean() essentially executes both ob_get_contents() and ob_end_clean().
---

diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
index 1e32b2f283..4cda9ff611 100644
--- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
@@ -457,9 +457,7 @@ class TemplateScriptingCompiler {
 		}
 		else {
 			$this->popTag($tagCommand);
-			$phpCode = "<?php \$blockContent = ob_get_contents();\n";
-			$phpCode .= "ob_end_clean();\n";
-			$phpCode .= "echo \$this->pluginObjects['".$className."']->execute(\$this->tagStack[count(\$this->tagStack) - 1][1], \$blockContent, \$this); }\n";
+			$phpCode = "<?php echo \$this->pluginObjects['".$className."']->execute(\$this->tagStack[count(\$this->tagStack) - 1][1], ob_get_clean(), \$this); }\n";
 			$phpCode .= "array_pop(\$this->tagStack);\n";
 			$phpCode .= "unset(\$blockContent, \$blockRepeat); ?>";
 		}
@@ -545,7 +543,7 @@ class TemplateScriptingCompiler {
 		else {
 			$capture = array_pop($this->captureStack);
 			$phpCode = "<?php\n";
-			$phpCode .= "\$this->v['tpl']['capture'][".$capture['name']."] = ob_get_contents();\nob_end_clean();\n";
+			$phpCode .= "\$this->v['tpl']['capture'][".$capture['name']."] = ob_get_clean();\n";
 			if (!empty($capture['variable'])) $phpCode .= "\$this->".($capture['append'] ? 'append' : 'assign')."(".$capture['variable'].", \$this->v['tpl']['capture'][".$capture['name']."]);\n";
 			$phpCode .= "?>";
 			return $phpCode;
@@ -733,7 +731,7 @@ class TemplateScriptingCompiler {
 		$phpCode .= '$this->includeTemplate('.$file.', array('.$argString.'), ('.$sandbox.' ? 1 : 0), $this->v[\'__PACKAGE_ID\']);'."\n";
 		
 		if ($assignVar !== false) {
-			$phpCode .= '$this->'.($append ? 'append' : 'assign').'('.$assignVar.', ob_get_contents()); ob_end_clean();'."\n";
+			$phpCode .= '$this->'.($append ? 'append' : 'assign').'('.$assignVar.', ob_get_clean());'."\n";
 		}
 		
 		$phpCode .= "\$this->v['tpl']['template'] = \$outerTemplateName".$hash.";\n";
diff --git a/wcfsetup/install/files/lib/system/template/plugin/IconCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/IconCompilerTemplatePlugin.class.php
index ed999feffa..53ef754ad6 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/IconCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/IconCompilerTemplatePlugin.class.php
@@ -51,7 +51,6 @@ class IconCompilerTemplatePlugin implements ICompilerTemplatePlugin {
 	 */
 	public function executeEnd(TemplateScriptingCompiler $compiler) {
 		$compiler->popTag('icon');
-		$hash = StringUtil::getRandomID();
-		return "<?php \$_icon".$hash." = ob_get_contents(); ob_end_clean(); echo wcf\system\style\StyleHandler::getInstance()->getStyle()->getIconPath(\$_icon".$hash.", '".$this->size."'); ?>";
+		return "<?php echo wcf\system\style\StyleHandler::getInstance()->getStyle()->getIconPath(ob_get_clean(), '".$this->size."'); ?>";
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php
index 8ec0d31288..3715d5dab5 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php
@@ -38,7 +38,6 @@ class LangCompilerTemplatePlugin implements ICompilerTemplatePlugin {
 	 */
 	public function executeEnd(TemplateScriptingCompiler $compiler) {
 		$compiler->popTag('lang');
-		$hash = StringUtil::getRandomID();
-		return "<?php \$_lang".$hash." = ob_get_contents(); ob_end_clean(); echo wcf\system\WCF::getLanguage()->getDynamicVariable(\$_lang".$hash.", \$this->tagStack[count(\$this->tagStack) - 1][1], (isset(\$this->tagStack[count(\$this->tagStack) - 1][1]['__optional']) ? \$this->tagStack[count(\$this->tagStack) - 1][1]['__optional'] : false)); array_pop(\$this->tagStack); ?>";
+		return "<?php echo wcf\system\WCF::getLanguage()->getDynamicVariable(ob_get_clean(), \$this->tagStack[count(\$this->tagStack) - 1][1], (isset(\$this->tagStack[count(\$this->tagStack) - 1][1]['__optional']) ? \$this->tagStack[count(\$this->tagStack) - 1][1]['__optional'] : false)); array_pop(\$this->tagStack); ?>";
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php b/wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php
index 11d44a77da..973ba66972 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php
@@ -31,7 +31,6 @@ class StaticlangCompilerTemplatePlugin implements ICompilerTemplatePlugin {
 	 */
 	public function executeEnd(TemplateScriptingCompiler $compiler) {
 		$compiler->popTag('staticlang');
-		$hash = StringUtil::getRandomID();
-		return "<?php \$_lang".$hash." = ob_get_contents(); ob_end_clean(); echo \wcf\system\WCF::getLanguage()->get(\$_lang".$hash."); ?>";
+		return "<?php echo \wcf\system\WCF::getLanguage()->get(ob_get_clean()); ?>";
 	}
 }