mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-04 12:29:25 +01:00
updated patch for 14.1
This commit is contained in:
parent
898fc3c9fc
commit
3bda66e097
@ -1,6 +1,6 @@
|
|||||||
Index: egroupware/admin/inc/class.uiasyncservice.inc.php
|
Index: egroupware/admin/inc/class.uiasyncservice.inc.php
|
||||||
===================================================================
|
===================================================================
|
||||||
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 35356)
|
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 46642)
|
||||||
+++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie)
|
+++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie)
|
||||||
@@ -99,16 +99,20 @@
|
@@ -99,16 +99,20 @@
|
||||||
$config->save_repository();
|
$config->save_repository();
|
||||||
@ -44,18 +44,19 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php
|
|||||||
echo "<hr><table border=0><tr>\n";
|
echo "<hr><table border=0><tr>\n";
|
||||||
Index: egroupware/phpgwapi/inc/class.egw.inc.php
|
Index: egroupware/phpgwapi/inc/class.egw.inc.php
|
||||||
===================================================================
|
===================================================================
|
||||||
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 35356)
|
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 46642)
|
||||||
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie)
|
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie)
|
||||||
@@ -558,10 +558,12 @@
|
@@ -597,11 +597,13 @@
|
||||||
|
_egw_log_exception($ex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// call the asyncservice check_run function if it is not explicitly set to cron-only
|
|
||||||
//
|
|
||||||
+/* not needed as rpm uses /etc/cron.d/egroupware
|
+/* not needed as rpm uses /etc/cron.d/egroupware
|
||||||
|
// call the asyncservice check_run function if it is not explicitly set to cron-only
|
||||||
if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default
|
if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default
|
||||||
{
|
{
|
||||||
ExecMethod('phpgwapi.asyncservice.check_run','fallback');
|
ExecMethod('phpgwapi.asyncservice.check_run','fallback');
|
||||||
}
|
}
|
||||||
+*/
|
+ */
|
||||||
$this->db->disconnect();
|
$this->db->disconnect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user