# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/thomas/Sites/sources/typo3_src-trunk
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: typo3/sysext/cms/class.tx_cms_be_layout.php
--- typo3/sysext/cms/class.tx_cms_be_layout.php Base (BASE)
+++ typo3/sysext/cms/class.tx_cms_be_layout.php Locally Modified (Based On LOCAL)
@@ -91,20 +91,16 @@
 				// create items and colPosList
 				if ($backendLayout['__config']['be_layout.'] && $backendLayout['__config']['be_layout.']['rows.']) {
 					foreach ($backendLayout['__config']['be_layout.']['rows.'] as $row) {
-						if (true && count($row['columns.'])) {
 							foreach ($row['columns.'] as $column) {
-								if (true) {
 									$backendLayout['__items'][] = array(
 										$column['name'],
 										$column['colPos'],
-										null
+								NULL
 									);
 									$backendLayout['__colPosList'][] = $column['colPos'];
 								}
 							}
 						}
-					}
-				}
\ No newline at end of file
 
 			}
 		}
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
--- typo3/sysext/cms/layout/class.tx_cms_layout.php Base (BASE)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php Locally Modified (Based On LOCAL)
@@ -445,7 +445,6 @@
 			$this->itemLabels[$name] = $GLOBALS['LANG']->sL($val['label']);
 		}
 
-
 		// Select display mode:
 		if (!$this->tt_contentConfig['single']) { // MULTIPLE column display mode, side by side:
 
@@ -622,12 +621,20 @@
 									(isset($columnConfig['colspan']) ? ' colspan="' . $columnConfig['colspan'] . '"' : '') .
 									(isset($columnConfig['rowspan']) ? ' rowspan="' . $columnConfig['rowspan'] . '"' : '') .
 									' class="t3-gridCell t3-page-column t3-page-column-' . $columnKey .
-									(isset($columnKey) ? ' t3-gridCell-disabled' : '') .
+									(!isset($columnConfig['colPos']) ? ' t3-gridCell-disabled' : '') .
 									(isset($columnConfig['colspan']) ? ' t3-gridCell-width' . $columnConfig['colspan'] : '') .
 									(isset($columnConfig['rowspan']) ? ' t3-gridCell-height' . $columnConfig['rowspan'] : '') . '">';
-							$grid .= $head[$columnKey] . $content[$columnKey] . '</td>';
 
+							// Draw the pre-generated header with edit and new buttons if a colPos is assigned.
+							// If not, a new header without any buttons will be generated.
+							if (isset($columnConfig['colPos'])) {
+								$grid .= $head[$columnKey] . $content[$columnKey];
+							} else {
+								$grid .= $this->tt_content_drawColHeader($columnConfig['name'], '', '');
 						}
+
+							$grid .=  '</td>';
+						}
\ No newline at end of file
 						$grid .= '</tr>';
 					}
 					$out .= $grid . '</table></div>';