diff --git a/setup/createtables_pgsql.inc.php b/setup/createtables_pgsql.inc.php
index bf3f5ba351..a5cdd4356d 100644
--- a/setup/createtables_pgsql.inc.php
+++ b/setup/createtables_pgsql.inc.php
@@ -11,11 +11,9 @@
/* $Id$ */
-
$sql = "CREATE TABLE config (
- config_name varchar(25),
- config_value varchar(100),
- UNIQUE (config_name)
+ config_name varchar(25) NOT NULL UNIQUE,
+ config_value varchar(100) NOT NULL
)";
$db->query($sql);
diff --git a/setup/index.php b/setup/index.php
index fe2e94864b..a36bb40a92 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -33,8 +33,8 @@
$db->Halt_On_Error = "no";
if (!isset($oldversion)){
- $db->query("select app_version from applications where app_name='admin'");
- $db->next_record();
+ @$db->query("select app_version from applications where app_name='admin'");
+ @$db->next_record();
$oldversion = $db->f("app_version");
}
@@ -201,10 +201,10 @@
Header("Location: $PHP_SELF?action=regularversion");
}
}else{
- $db->query("select * from config");
- if ($db->num_rows() == 0){
- $db->query("select * from accounts");
- if ($db->num_rows() == 0){
+ @$db->query("select * from config");
+ if (@$db->num_rows() == 0){
+ @$db->query("select * from accounts");
+ if (@$db->num_rows() == 0){
echo "phpGroupWare Setup\n";
echo "\n";
echo "