diff --git a/phpgwapi/setup/config.inc.php b/phpgwapi/setup/config.inc.php
index 611512a38a..b67028d77d 100644
--- a/phpgwapi/setup/config.inc.php
+++ b/phpgwapi/setup/config.inc.php
@@ -40,7 +40,7 @@
-
+
Attempt to use correct mimetype for FTP instead of default 'application/octet-stream'. |
diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index c087302d7f..8e0ec72c9b 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -421,7 +421,7 @@
*/
function process_upgrade($setup_info,$DEBUG=False)
{
- if (!$this->oProc)
+ if (!@$this->oProc)
{
$this->init_process();
}
@@ -478,7 +478,7 @@
// This should be a break with a status setting, or not at all
//break;
}
- if (file_exists($appdir . 'tables_update.inc.php') && !$setup_info[$key]['updateincluded'])
+ if (file_exists($appdir . 'tables_update.inc.php') && !@$setup_info[$key]['updateincluded'])
{
include ($appdir . 'tables_update.inc.php');
$setup_info[$key]['updateincluded'] = True;
|