From c3a86a1a11ce7f9affee7c9d3f7f580492756929 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 30 Jun 2014 07:42:51 +0200 Subject: [PATCH] avoid null for viewport, fixed #55 --- module/config/bootstrap/layout.php | 2 ++ module/dca/tl_layout.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/config/bootstrap/layout.php b/module/config/bootstrap/layout.php index 36ce80b..7cbb66d 100644 --- 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 index 1cb2b36..6f2a1ed 100644 --- 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 ''", );