extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mergeprint: fixed not working merge (white screen, nothing in error-log) under PHP 5.2.6

Browse Source 
Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
This commit is contained in:
Ralf Becker 2011-11-16 09:26:23 +00:00
parent 9fad5b84ab
commit 978b014ffc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etemplate/inc/class.bo_merge.inc.php
View File

@ -360,7 +360,7 @@ abstract class bo_merge
/** /**
* getExportLimit * getExportLimit
* checks if there is an exportlimit set, and returns * checks if there is an exportlimit set, and returns
* @param mixed $app_limit checks and validates app_limit, if not set returns the global limit * @param mixed $app_limit checks and validates app_limit, if not set returns the global limit
* *
* @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction * @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction
@ -376,7 +376,7 @@ abstract class bo_merge
{ {
//error_log(__METHOD__.__LINE__.' -> '.$app_limit.' '.function_backtrace()); //error_log(__METHOD__.__LINE__.' -> '.$app_limit.' '.function_backtrace());
$exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit']; $exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit'];
if ($app !='common') if ($app !='common')
{ {
$app_limit = $GLOBALS['egw']->hooks->single('export_limit',$app); $app_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
if ($app_limit) $exportLimitStore[$app] = $app_limit; if ($app_limit) $exportLimitStore[$app] = $app_limit;
@ -387,7 +387,7 @@ abstract class bo_merge
$exportLimitStore[$app] = false; $exportLimitStore[$app] = false;
return false; return false;
} }
if (is_numeric($exportLimitStore[$app])) if (is_numeric($exportLimitStore[$app]))
{ {
$exportLimitStore[$app] = (int)$exportLimitStore[$app]; $exportLimitStore[$app] = (int)$exportLimitStore[$app];
@ -523,8 +523,11 @@ abstract class bo_merge
{ {
try try
{ {
$element = new SimpleXMLelement($content); // does NOT work with php 5.2.6: Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
$content = @$xslt->transformToXml($element); //$element = new SimpleXMLelement($content);
$element = new DOMDocument('1.0', 'utf-8');
$element->loadXML($content);
$content = $xslt->transformToXml($element);
//echo $content;die(); //echo $content;die();
// Word 2003 needs two declarations, add extra declaration back in // Word 2003 needs two declarations, add extra declaration back in
@ -540,7 +543,7 @@ abstract class bo_merge
} }
catch (Exception $e) catch (Exception $e)
{ {
error_log($e); error_log($e->getMessage());
// Failed... // Failed...
} }
} }