tweet_live: comparison web/lib/Zend/View/Helper/HeadMeta.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_View
 * @subpackage Helper
-* @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)
-* @version    $Id: HeadMeta.php 20096 2010-01-06 02:05:09Z bkarwin $
+* @version    $Id: HeadMeta.php 24776 2012-05-08 18:36:40Z adamlundrigan $
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 /** Zend_View_Helper_Placeholder_Container_Standalone */
 require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
 *
 * @see        http://www.w3.org/TR/xhtml1/dtds.html
 * @uses       Zend_View_Helper_Placeholder_Container_Standalone
 * @package    Zend_View
 * @subpackage Helper
-* @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_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone
 {
 /**
 * Types of attributes
 * @var array
 */
-protected $_typeKeys     = array('name', 'http-equiv', 'charset');
+protected $_typeKeys     = array('name', 'http-equiv', 'charset', 'property');
 protected $_requiredKeys = array('content');
 protected $_modifierKeys = array('lang', 'scheme');
 /**
 * @var string registry key
 switch ($type) {
 case 'Name':
 return 'name';
 case 'HttpEquiv':
 return 'http-equiv';
+case 'Property':
+return 'property';
 default:
 require_once 'Zend/View/Exception.php';
 $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type));
 $e->setView($this->view);
 throw $e;
 * - setName($keyValue, $content, $modifiers = array())
 * - appendHttpEquiv($keyValue, $content, $modifiers = array())
 * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array())
 * - prependHttpEquiv($keyValue, $content, $modifiers = array())
 * - setHttpEquiv($keyValue, $content, $modifiers = array())
+* - appendProperty($keyValue, $content, $modifiers = array())
+* - offsetGetProperty($index, $keyValue, $content, $modifiers = array())
+* - prependProperty($keyValue, $content, $modifiers = array())
+* - setProperty($keyValue, $content, $modifiers = array())
 *
 * @param  string $method
 * @param  array $args
 * @return Zend_View_Helper_HeadMeta
 */
 public function __call($method, $args)
 {
-if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv)$/', $method, $matches)) {
+if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property)$/', $method, $matches)) {
 $action = $matches['action'];
 $type   = $this->_normalizeType($matches['type']);
 $argc   = count($args);
 $index  = null;
 }
 return parent::__call($method, $args);
 }
-	/**
+/**
-	 * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
+* Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
-	 *
+*
-	 * Not valid in a non-HTML5 doctype
+* Not valid in a non-HTML5 doctype
-	 *
+*
-	 * @param string $charset
+* @param string $charset
-	 * @return Zend_View_Helper_HeadMeta Provides a fluent interface
+* @return Zend_View_Helper_HeadMeta Provides a fluent interface
-	 */
+*/
 public function setCharset($charset)
 {
 $item = new stdClass;
 $item->type = 'charset';
 $item->charset = $charset;
 || !isset($item->modifiers))
 {
 return false;
 }
+$isHtml5 = is_null($this->view) ? false : $this->view->doctype()->isHtml5();
 if (!isset($item->content)
-&& (! $this->view->doctype()->isHtml5()
+&& (! $isHtml5 || (! $isHtml5 && $item->type !== 'charset'))) {
-|| (! $this->view->doctype()->isHtml5() && $item->type !== 'charset'))) {
+return false;
+}
+// <meta property= ... /> is only supported with doctype RDFa
+if ( !is_null($this->view) && !$this->view->doctype()->isRdfa()
+&& $item->type === 'property') {
 return false;
 }
 return true;
 }
 }
 $type = $item->type;
 $modifiersString = '';
 foreach ($item->modifiers as $key => $value) {
-if ($this->view->doctype()->isHtml5()
+if (!is_null($this->view) && $this->view->doctype()->isHtml5()
 && $key == 'scheme') {
 require_once 'Zend/View/Exception.php';
 throw new Zend_View_Exception('Invalid modifier '
 . '"scheme" provided; not supported by HTML5');
 }
 }
 if ($this->view instanceof Zend_View_Abstract) {
 if ($this->view->doctype()->isHtml5()
 && $type == 'charset') {
-				$tpl = ($this->view->doctype()->isXhtml())
+$tpl = ($this->view->doctype()->isXhtml())
-					? '<meta %s="%s"/>'
+? '<meta %s="%s"/>'
-					: '<meta %s="%s">';
+: '<meta %s="%s">';
 } elseif ($this->view->doctype()->isXhtml()) {
 $tpl = '<meta %s="%s" content="%s" %s/>';
 } else {
 $tpl = '<meta %s="%s" content="%s" %s>';
 }
 $type,
 $this->_escape($item->$type),
 $this->_escape($item->content),
 $modifiersString
 );
+if (isset($item->modifiers['conditional'])
+&& !empty($item->modifiers['conditional'])
+&& is_string($item->modifiers['conditional']))
+{
+$meta = '<!--[if ' . $this->_escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
+}
 return $meta;
 }
 /**
 * Render placeholder as string

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c