Ignore:
Timestamp:
2013/08/28 13:26:44 (11 years ago)
Author:
m_uehara
Message:

#2275
影響が大きいため、2.13.0では対応を行わない r23125 r23128 r23133 を差し戻します。

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/module/Calendar/Decorator/Wrapper.php

    r23125 r23141  
    11<?php 
    22/* vim: set expandtab tabstop=4 shiftwidth=4: */ 
    3  
     3// 
     4// +----------------------------------------------------------------------+ 
     5// | PHP Version 4                                                        | 
     6// +----------------------------------------------------------------------+ 
     7// | Copyright (c) 1997-2002 The PHP Group                                | 
     8// +----------------------------------------------------------------------+ 
     9// | This source file is subject to version 2.02 of the PHP license,      | 
     10// | that is bundled with this package in the file LICENSE, and is        | 
     11// | available at through the world-wide-web at                           | 
     12// | http://www.php.net/license/3_0.txt.                                  | 
     13// | If you did not receive a copy of the PHP license and are unable to   | 
     14// | obtain it through the world-wide-web, please send a note to          | 
     15// | license@php.net so we can mail you a copy immediately.               | 
     16// +----------------------------------------------------------------------+ 
     17// | Authors: Harry Fuecks <hfuecks@phppatterns.com>                      | 
     18// |          Lorenzo Alberton <l dot alberton at quipo dot it>           | 
     19// +----------------------------------------------------------------------+ 
     20// 
     21// $Id: Wrapper.php,v 1.2 2005/11/03 20:35:03 quipo Exp $ 
     22// 
    423/** 
    5  * Contains the Calendar_Decorator_Wrapper class 
    6  * 
    7  * PHP versions 4 and 5 
    8  * 
    9  * LICENSE: Redistribution and use in source and binary forms, with or without 
    10  * modification, are permitted provided that the following conditions are met: 
    11  * 1. Redistributions of source code must retain the above copyright 
    12  *    notice, this list of conditions and the following disclaimer. 
    13  * 2. Redistributions in binary form must reproduce the above copyright 
    14  *    notice, this list of conditions and the following disclaimer in the 
    15  *    documentation and/or other materials provided with the distribution. 
    16  * 3. The name of the author may not be used to endorse or promote products 
    17  *    derived from this software without specific prior written permission. 
    18  * 
    19  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
    20  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
    21  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
    22  * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY 
    23  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
    24  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
    25  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
    26  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
    28  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    29  * 
    30  * @category  Date and Time 
    31  * @package   Calendar 
    32  * @author    Harry Fuecks <hfuecks@phppatterns.com> 
    33  * @author    Lorenzo Alberton <l.alberton@quipo.it> 
    34  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton 
    35  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause) 
    36  * @version   CVS: $Id: Wrapper.php 300729 2010-06-24 12:05:53Z quipo $ 
    37  * @link      http://pear.php.net/package/Calendar 
     24 * @package Calendar 
     25 * @version $Id: Wrapper.php,v 1.2 2005/11/03 20:35:03 quipo Exp $ 
    3826 */ 
    3927 
     
    5341/** 
    5442 * Decorator to help with wrapping built children in another decorator 
    55  * 
    56  * @category  Date and Time 
    57  * @package   Calendar 
    58  * @author    Harry Fuecks <hfuecks@phppatterns.com> 
    59  * @author    Lorenzo Alberton <l.alberton@quipo.it> 
    60  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton 
    61  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause) 
    62  * @link      http://pear.php.net/package/Calendar 
    63  * @access    public 
     43 * @package Calendar 
     44 * @access public 
    6445 */ 
    6546class Calendar_Decorator_Wrapper extends Calendar_Decorator 
     
    6748    /** 
    6849     * Constructs Calendar_Decorator_Wrapper 
    69      * 
    70      * @param object &$Calendar subclass of Calendar 
    71      * 
     50     * @param object subclass of Calendar 
    7251     * @access public 
    7352     */ 
     
    7958    /** 
    8059     * Wraps objects returned from fetch in the named Decorator class 
    81      * 
    82      * @param string $decorator name of Decorator class to wrap with 
    83      * 
     60     * @param string name of Decorator class to wrap with 
    8461     * @return object instance of named decorator 
    8562     * @access public 
     
    8966        $Calendar = parent::fetch(); 
    9067        if ($Calendar) { 
    91             $ret = new $decorator($Calendar); 
     68            $ret =& new $decorator($Calendar); 
    9269        } else { 
    9370            $ret = false; 
     
    9875    /** 
    9976     * Wraps the returned calendar objects from fetchAll in the named decorator 
    100      * 
    101      * @param string $decorator name of Decorator class to wrap with 
    102      * 
     77     * @param string name of Decorator class to wrap with 
    10378     * @return array 
    10479     * @access public 
     
    10883        $children = parent::fetchAll(); 
    10984        foreach ($children as $key => $Calendar) { 
    110             $children[$key] = new $decorator($Calendar); 
     85            $children[$key] = & new $decorator($Calendar); 
    11186        } 
    11287        return $children; 
Note: See TracChangeset for help on using the changeset viewer.