import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -16,7 +16,7 @@
|
||||
* @package Zend_View
|
||||
* @subpackage Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @version $Id: Abstract.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @version $Id: Abstract.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
|
||||
@ -71,7 +71,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
* @var string
|
||||
*/
|
||||
protected $_indent = '';
|
||||
|
||||
|
||||
/**
|
||||
* Whether or not we're already capturing for this given container
|
||||
* @var bool
|
||||
@ -89,7 +89,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
* @var string
|
||||
*/
|
||||
protected $_captureKey;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor - This is needed so that we can attach a class member as the ArrayObject container
|
||||
*
|
||||
@ -99,7 +99,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
{
|
||||
parent::__construct(array(), parent::ARRAY_AS_PROPS);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set a single value
|
||||
*
|
||||
@ -113,8 +113,8 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
|
||||
/**
|
||||
* Prepend a value to the top of the container
|
||||
*
|
||||
* @param mixed $value
|
||||
*
|
||||
* @param mixed $value
|
||||
* @return void
|
||||
*/
|
||||
public function prepend($value)
|
||||
@ -236,8 +236,8 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
|
||||
/**
|
||||
* Retrieve whitespace representation of $indent
|
||||
*
|
||||
* @param int|string $indent
|
||||
*
|
||||
* @param int|string $indent
|
||||
* @return string
|
||||
*/
|
||||
public function getWhitespace($indent)
|
||||
@ -248,7 +248,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
|
||||
return (string) $indent;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Start capturing content to push into placeholder
|
||||
*
|
||||
@ -305,10 +305,10 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
case self::APPEND:
|
||||
default:
|
||||
if (null !== $key) {
|
||||
if (empty($this[$key])) {
|
||||
$this[$key] = $data;
|
||||
} else {
|
||||
$this[$key] .= $data;
|
||||
if (empty($this[$key])) {
|
||||
$this[$key] = $data;
|
||||
} else {
|
||||
$this[$key] .= $data;
|
||||
}
|
||||
} else {
|
||||
$this[$this->nextIndex()] = $data;
|
||||
@ -319,7 +319,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
|
||||
/**
|
||||
* Get keys
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getKeys()
|
||||
@ -343,7 +343,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
|
||||
return $nextIndex = max($keys) + 1;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Render the placeholder
|
||||
*
|
||||
@ -351,12 +351,12 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje
|
||||
*/
|
||||
public function toString($indent = null)
|
||||
{
|
||||
$indent = ($indent !== null)
|
||||
? $this->getWhitespace($indent)
|
||||
$indent = ($indent !== null)
|
||||
? $this->getWhitespace($indent)
|
||||
: $this->getIndent();
|
||||
|
||||
|
||||
$items = $this->getArrayCopy();
|
||||
$return = $indent
|
||||
$return = $indent
|
||||
. $this->getPrefix()
|
||||
. implode($this->getSeparator(), $items)
|
||||
. $this->getPostfix();
|
||||
|
Reference in New Issue
Block a user