← Back to branch summary

~ubuntu-branches/ubuntu/utopic/zendframework/utopic

« back to all changes in this revision

Viewing changes to library/Zend/Filter/HtmlEntities.php

  • Committer: Bazaar Package Importer
  • Author(s): Frank Habermann
  • Date: 2010-04-28 20:10:00 UTC
  • mfrom: (1.3.1 upstream) (9.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100428201000-o347bj5qb5i3tpot
Tags: 1.10.4-1
new upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
library/Zend/Filter/HtmlEntities.php
16
16
 * @package    Zend_Filter
17
17
 * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
18
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
19
 
 * @version    $Id: HtmlEntities.php 20104 2010-01-06 21:26:01Z matthew $
 
19
 * @version    $Id: HtmlEntities.php 21061 2010-02-15 21:56:54Z thomas $
20
20
 */
21
21
 
22
22
/**
62
62
     */
63
63
    public function __construct($options = array())
64
64
    {
65
 
        if (!is_array($options)) {
 
65
        if ($options instanceof Zend_Config) {
 
66
            $options = $options->toArray();
 
67
        } else if (!is_array($options)) {
66
68
            $options = func_get_args();
67
69
            $temp['quotestyle'] = array_shift($options);
68
70
            if (!empty($options)) {