cvs: pear /Structures_DataGrid package.xml /Structures_DataGrid/DataGrid/Renderer HTMLTable.php

olivierg Wed Mar 1 22:11:03 2006 UTC Modified files: /pear/Structures_DataGrid package.xml /pear/Structures_DataGrid/DataGrid/Renderer HTMLTable.php Log: Fixed Req #5886 "Passing default-encoding to htmlentities" http://cvs.php.net/viewcvs.cgi/pear/Structures_DataGrid/package.xml?r1=1.42&r2=1.43&diff_format=u Index: pear/Structures_DataGrid/package.xml diff -u pear/Structures_DataGrid/package.xml:1.42 pear/Structures_DataGrid/package.xml:1.43 --- pear/Structures_DataGrid/package.xml:1.42 Wed Mar 1 15:16:08 2006 +++ pear/Structures_DataGrid/package.xml Wed Mar 1 22:11:03 2006 @@ -30,7 +30,7 @@ </maintainer> </maintainers> <release> - <version>?</version> + <version>0.7.0</version> <date>?</date> <license>PHP License</license> <state>beta</state> @@ -75,7 +75,8 @@ Bug #6031 "charset GB2312 display not correctly" : New HTMLTable "encoding" option (passed to htmlspecialchars()) Thanks digit_shine &lt;digit_shine at yahoo dot com dot cn&gt; - + + ########################################################################## # FEATURE REQUESTS # ########################################################################## @@ -116,6 +117,12 @@ This request has not been implemented, but some improvements have been made in order to support multiple field sorting in the future + Req #5886 "Passing default-encoding to htmlentities" : + Fixed. The default value of the new HTMLTable "encoding" option + (related to Bug #6031) is now set from mb_internal_encoding() if the + mbstring extension is loaded. Otherwise, the default is ISO-8859-1. + Thanks &lt;tobias at neuyork dot de&gt; + ########################################################################## # OTHER FIXES AND CHANGES # http://cvs.php.net/viewcvs.cgi/pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php?r1=1.83&r2=1.84&diff_format=u Index: pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php diff -u pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php:1.83 pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php:1.84 --- pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php:1.83 Wed Mar 1 15:16:08 2006 +++ pear/Structures_DataGrid/DataGrid/Renderer/HTMLTable.php Wed Mar 1 22:11:03 2006 @@ -18,7 +18,7 @@ // | Mark Wiesemann <wiesemann@php.net> | // +----------------------------------------------------------------------+ // -// $Id: HTMLTable.php,v 1.83 2006/03/01 15:16:08 olivierg Exp $ +// $Id: HTMLTable.php,v 1.84 2006/03/01 22:11:03 olivierg Exp $ require_once 'Structures/DataGrid/Renderer/Common.php'; require_once 'HTML/Table.php'; @@ -51,10 +51,12 @@ * array(fieldName => array(attribute => value, ...) ... ) * - convertEntities : whether or not to convert html entities. Default: true * This calls htmlspecialchars(). - * - encoding : the content encoding. Default: ISO-8859-1 + * - encoding : the content encoding. If the mbstring extension is + * present the default value is set from + * mb_internal_encoding(), otherwise it is ISO-8859-1 * * - * @version $Revision: 1.83 $ + * @version $Revision: 1.84 $ * @author Andrew S. Nagy <asnagy@webitecture.org> * @author Olivier Guilyardi <olivier@samalyse.com> * @author Mark Wiesemann <wiesemann@php.net> @@ -106,7 +108,8 @@ 'columnAttributes' => array(), 'headerAttributes' => array(), 'convertEntities' => true, - 'encoding' => 'ISO-8859-1', + 'encoding' => function_exists('mb_internal_encoding') + ? mb_internal_encoding() : 'ISO-8859-1', ) ); }