diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index c448a00229..3c8fdea25f 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -368,7 +368,7 @@ if ($phpgw_info['server']['force_theme'] == 'user_choice') { - @include(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . $phpgw_info['user']['preferences']['common']['theme'] . '.theme'); + include(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . $phpgw_info['user']['preferences']['common']['theme'] . '.theme'); if ($phpgw_info['theme']['bg_color'] == '') { @@ -386,7 +386,7 @@ } else { - @include(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . $phpgw_info['server']['force_theme'] . '.theme'); + include(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . $phpgw_info['server']['force_theme'] . '.theme'); if ($phpgw_info['theme']['bg_color'] == '') { /* Looks like there was a problem finding that theme. Try the default */ diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php index 9a48158f2d..ff87ee8cc5 100644 --- a/phpgwapi/setup/tables_current.inc.php +++ b/phpgwapi/setup/tables_current.inc.php @@ -88,7 +88,7 @@ 'session_logintime' => array('type' => 'varchar', 'precision' => 4), 'session_dla' => array('type' => 'varchar', 'precision' => 4), 'session_action' => array('type' => 'varchar', 'precision' => 255), - 'session_flags' => array('type' => 'char', 'precision' => 2), + 'session_flags' => array('type' => 'char', 'precision' => 2) ), 'pk' => array(), 'fk' => array(), @@ -160,7 +160,7 @@ 'phpgw_nextid' => array( 'fd' => array( 'id' => array('type' => 'int', 'precision' => 4, 'nullable' => true), - 'appname' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false), + 'appname' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false) ), 'pk' => array(), 'fk' => array(), @@ -184,6 +184,6 @@ 'fk' => array(), 'ix' => array(), 'uc' => array() - ), + ) ); ?>