avoid null for viewport, fixed #55

netzmacht-archive · Jun 30, 2014 · c3a86a1 · c3a86a1
1 parent c229641
commit c3a86a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/module/config/bootstrap/layout.php b/module/config/bootstrap/layout.php
@@ -44,6 +44,8 @@
 			'3cl'    => array('bootstrap_leftClass', 'bootstrap_mainClass', 'bootstrap_rightClass'),
 		),
 	),
+
+	'viewport' => '',
 );
 
 if(version_compare(VERSION, '3.3', '<')) {

diff --git a/module/dca/tl_layout.php b/module/dca/tl_layout.php
@@ -211,9 +211,9 @@
 (
 	'label'                   => &$GLOBALS['TL_LANG']['tl_layout']['viewport'],
 	'exclude'                 => true,
-	'default'                 => $GLOBALS['BOOTSTRAP']['layout']['viewport'],
+	'default'                 => (string) $GLOBALS['BOOTSTRAP']['layout']['viewport'],
 	'inputType'               => 'text',
-	'eval'                    => array('tl_class' => 'w50', 'decodeEntities' => true),
+	'eval'                    => array('tl_class' => 'w50', 'decodeEntities'=>true, 'maxlength'=>255),
 	'sql'                     => "varchar(255) NOT NULL default ''",
 );
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,8 @@ @@
     			'3cl'    => array('bootstrap_leftClass', 'bootstrap_mainClass', 'bootstrap_rightClass'),
     		),
     	),
+    	'viewport' => '',
     );
     if(version_compare(VERSION, '3.3', '<')) {
@@ Expand Down @@