CHANGELOG.md

@@ -1,6 +1,16 @@
 Contao Open Source CMS Changelog
 ================================
 
+Version 2.11.11 (2013-04-03)
+----------------------------
+
+### Fixed
+Pass the style attribute to empty image gallery table cells (see #5485).
+
+### Fixed
+Do not override the website path in the default config file (see #5339).
+
+
 Version 2.11.10 (2013-03-21)
 ----------------------------
 

plugins/tinyMCE/plugins/spellchecker/classes/GoogleSpell.php

@@ -39,7 +39,9 @@ function &getSuggestions($lang, $word) {
 		$matches = $this->_getMatches($lang, $word);
 
 		if (count($matches) > 0)
-			$sug = explode("\t", utf8_encode($this->_unhtmlentities($matches[0][4])));
+			// PATCH: do not utf8_encode() here
+			//$sug = explode("\t", utf8_encode($this->_unhtmlentities($matches[0][4])));
+			$sug = explode("\t", $this->_unhtmlentities($matches[0][4]));
 
 		// Remove empty
 		foreach ($sug as $item) {

system/config/config.php

@@ -73,7 +73,6 @@
 $GLOBALS['TL_CONFIG']['disableAlias']   = false;
 $GLOBALS['TL_CONFIG']['minifyMarkup']   = false;
 $GLOBALS['TL_CONFIG']['gzipScripts']    = false;
-$GLOBALS['TL_CONFIG']['websitePath']    = null;
 
 
 /**

system/constants.php

@@ -57,7 +57,7 @@
  * the web browser reload those resources after a Contao update.
  */
 define('VERSION', '2.11');
-define('BUILD', '10');
+define('BUILD', '11');
 define('LONG_TERM_SUPPORT', true);
 define('CODEMIRROR', '2.2');
 define('DATEPICKER', '2.1.1');

system/modules/frontend/ContentGallery.php

@@ -275,6 +275,7 @@ protected function compile()
 				// Empty cell
 				if (!is_array($images[($i+$j)]) || ($j+$i) >= $limit)
 				{
+					$objCell->colWidth = $colwidth . '%';
 					$objCell->class = 'col_'.$j . $class_td;
 					$body[$key][$j] = $objCell;
 
@@ -291,7 +292,6 @@ protected function compile()
 				// Add column width and class
 				$objCell->colWidth = $colwidth . '%';
 				$objCell->class = 'col_'.$j . $class_td;
-
 				$body[$key][$j] = $objCell;
 			}
 

system/modules/frontend/templates/gallery_default.html5

@@ -5,7 +5,7 @@
 <tr class="<?php echo $class; ?>">
 <?php foreach ($row as $col): ?>
 <?php if (!$col->addImage): ?>
-  <td class="<?php echo $col->class; ?> empty">&nbsp;</td>
+  <td class="<?php echo $col->class; ?> empty" style="width:<?php echo $col->colWidth; ?>">&nbsp;</td>
 <?php else: ?>
   <td class="<?php echo $col->class; ?>" style="width:<?php echo $col->colWidth; ?>">
   <figure class="image_container"<?php if ($col->margin): ?> style="<?php echo $col->margin; ?>"<?php endif; ?>>

system/modules/frontend/templates/gallery_default.xhtml

@@ -5,7 +5,7 @@
 <tr class="<?php echo $class; ?>">
 <?php foreach ($row as $col): ?>
 <?php if (!$col->addImage): ?>
-  <td class="<?php echo $col->class; ?> empty">&nbsp;</td>
+  <td class="<?php echo $col->class; ?> empty" style="width:<?php echo $col->colWidth; ?>">&nbsp;</td>
 <?php else: ?>
   <td class="<?php echo $col->class; ?>" style="width:<?php echo $col->colWidth; ?>">
   <div class="image_container"<?php if ($col->margin): ?> style="<?php echo $col->margin; ?>"<?php endif; ?>>

system/modules/rep_base/RepositorySettings.php

@@ -52,6 +52,7 @@
 		'30000009,30000009;'.	// 3.0.0 stable
 		'30000006,30000006;'.	// 3.0.0 RC1
 		'30000003,30000003;'.	// 3.0.0 beta1
+		'20110119,20110119;'.	// 2.11.11 stable
 		'20110109,20110109;'.	// 2.11.10 stable
 		'20110099,20110099;'.	// 2.11.9 stable
 		'20110089,20110089;'.	// 2.11.8 stable