diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Db/Adapter/Pdo/Mysql.php --- a/web/lib/Zend/Db/Adapter/Pdo/Mysql.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Db/Adapter/Pdo/Mysql.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysql.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mysql.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract @@ -77,6 +77,19 @@ ); /** + * Override _dsn() and ensure that charset is incorporated in mysql + * @see Zend_Db_Adapter_Pdo_Abstract::_dsn() + */ + protected function _dsn() + { + $dsn = parent::_dsn(); + if (isset($this->_config['charset'])) { + $dsn .= ';charset=' . $this->_config['charset']; + } + return $dsn; + } + + /** * Creates a PDO object and connects to the database. * * @return void