diff options
| -rw-r--r-- | toexport.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toexport.inc.php b/toexport.inc.php index 66bbf542..9f515fe9 100644 --- a/toexport.inc.php +++ b/toexport.inc.php @@ -107,9 +107,9 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = if ($hasNumIndex) { for ($j=0; $j < $max; $j++) { $v = $rs->fields[$j]; - if (!is_object($v)) $v = trim($v); + if (!is_object($v)) $v = trim((string)$v); else $v = 'Object'; - if ($escquote) $v = str_replace($quote,$escquotequote,$v); + if ($escquote) $v = str_replace($quote,$escquotequote,(string)$v); $v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)))); if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote"; @@ -117,8 +117,8 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = } } else { // ASSOCIATIVE ARRAY foreach($rs->fields as $v) { - if ($escquote) $v = str_replace($quote,$escquotequote,trim($v)); - $v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)))); + if ($escquote) $v = str_replace($quote,$escquotequote,trim((string)$v)); + $v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,(string)$v)))); if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote"; else $elements[] = $v; |