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

contao · Oct 3, 2014 · 9c272cc · 9c272cc
1 parent 724d71a
commit 9c272cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
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'); ?>