extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes from ralf regarding the Object of class xajaxResponse could not be converted to string error, introduced with the new ajax version

Browse Source
This commit is contained in:
Klaus Leithoff 2010-01-14 08:37:07 +00:00
parent 88be03483d
commit 31186e976c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xajax.php
View File

@ -29,7 +29,7 @@ function xajax_redirect(&$anon_account)
$response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';"); $response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';");
header('Content-type: text/xml; charset='.translation::charset()); header('Content-type: text/xml; charset='.translation::charset());
echo $response->getXML(); echo $response->printOutput();
common::egw_exit(); common::egw_exit();
} }
@ -45,7 +45,7 @@ function ajax_exception_handler(Exception $e)
$response = new xajaxResponse(); $response = new xajaxResponse();
$response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString()); $response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString());
header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?translation::charset():'utf-8')); header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?translation::charset():'utf-8'));
echo $response->getXML(); echo $response->printOutput();
if (is_object($GLOBALS['egw'])) if (is_object($GLOBALS['egw']))
{ {
common::egw_exit(); common::egw_exit();