Adjust the dir="rtl" output (see #7171)

leofeyer · leofeyer · commit 9c272cc40845 · 2014-10-03T14:49:42.000+02:00
diff --git a/system/modules/core/pages/PageRegular.php b/system/modules/core/pages/PageRegular.php
@@ -149,7 +149,7 @@ public function generate($objPage, $blnCheckRequest=false)
 		// Mark RTL languages (see #7171)
 		if ($GLOBALS['TL_LANG']['MSC']['textDirection'] == 'rtl')
 		{
-			$this->Template->direction = ' dir="rtl"';
+			$this->Template->isRTL = true;
 		}
 
 		// HOOK: modify the page or layout object
@@ -457,7 +457,7 @@ protected function createTemplate($objPage, $objLayout)
 		$this->Template->base = \Environment::get('base');
 		$this->Template->disableCron = \Config::get('disableCron');
 		$this->Template->cronTimeout = $this->getCronTimeout();
-		$this->Template->direction = '';
+		$this->Template->isRTL = false;
 	}
 
 
diff --git a/system/modules/core/templates/frontend/fe_page.html5 b/system/modules/core/templates/frontend/fe_page.html5
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<?php echo $this->language; ?>"<?php echo $this->direction; ?>>
+<html lang="<?php echo $this->language; ?>"<?php if ($this->isRTL): ?> dir="rtl"<?php endif; ?>>
 <head>
 
   <?php $this->block('head'); ?>
diff --git a/system/modules/core/templates/frontend/fe_page.xhtml b/system/modules/core/templates/frontend/fe_page.xhtml
@@ -1,5 +1,5 @@
 <?php echo $this->doctype; ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>"<?php echo $this->direction; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>"<?php if ($this->isRTL): ?> dir="rtl"<?php endif; ?>>
 <head>
 
   <?php $this->block('head'); ?>

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function generate($objPage, $blnCheckRequest=false)`
`149`	`149`	`// Mark RTL languages (see #7171)`
`150`	`150`	`if ($GLOBALS['TL_LANG']['MSC']['textDirection'] == 'rtl')`
`151`	`151`	`{`
`152`		`- $this->Template->direction = ' dir="rtl"';`
	`152`	`+ $this->Template->isRTL = true;`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`// HOOK: modify the page or layout object`
`@@ -457,7 +457,7 @@ protected function createTemplate($objPage, $objLayout)`
`457`	`457`	`$this->Template->base = \Environment::get('base');`
`458`	`458`	`$this->Template->disableCron = \Config::get('disableCron');`
`459`	`459`	`$this->Template->cronTimeout = $this->getCronTimeout();`
`460`		`- $this->Template->direction = '';`
	`460`	`+ $this->Template->isRTL = false;`
`461`	`461`	`}`
`462`	`462`
`463`	`463`