cvs: pear /PHP_Compat/Compat/Function fputcsv.php

aidan Tue Nov 22 03:28:17 2005 EDT Modified files: /pear/PHP_Compat/Compat/Function fputcsv.php Log: Fixes bug #5691 http://cvs.php.net/diff.php/pear/PHP_Compat/Compat/Function/fputcsv.php?r1=1.1&r2=1.2&ty=u Index: pear/PHP_Compat/Compat/Function/fputcsv.php diff -u pear/PHP_Compat/Compat/Function/fputcsv.php:1.1 pear/PHP_Compat/Compat/Function/fputcsv.php:1.2 --- pear/PHP_Compat/Compat/Function/fputcsv.php:1.1 Tue May 31 05:09:27 2005 +++ pear/PHP_Compat/Compat/Function/fputcsv.php Tue Nov 22 03:28:16 2005 @@ -15,7 +15,7 @@ // | Authors: Aidan Lister <aidan@php.net> | // +----------------------------------------------------------------------+ // -// $Id: fputcsv.php,v 1.1 2005/05/31 09:09:27 aidan Exp $ +// $Id: fputcsv.php,v 1.2 2005/11/22 08:28:16 aidan Exp $ /** @@ -26,7 +26,7 @@ * @link http://php.net/function.fprintf * @author Twebb <twebb@boisecenter.com> * @author Aidan Lister <aidan@php.net> - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @since PHP 5 * @require PHP 4.0.0 (user_error) */ @@ -34,16 +34,16 @@ function fputcsv($handle, $fields, $delimiter = ',', $enclosure = '"') { // Sanity Check - if (!is_resource($extension)) { + if (!is_resource($handle)) { user_error('fputcsv() expects parameter 1 to be resource, ' . - gettype($extension) . ' given', E_USER_WARNING); + gettype($handle) . ' given', E_USER_WARNING); return false; } $str = ''; foreach ($fields as $cell) { - $cell = str_replace($enclosure, $enclosure.$enclosure, $cell); + $cell = str_replace($enclosure, $enclosure . $enclosure, $cell); if (strchr($cell, $delimiter) !== false || strchr($cell, $enclosure) !== false ||