Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-03 06:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update framework/web/CClientScript.php

Browse Source 
Allow duplicate meta tags as well as unique ones.
This commit is contained in:
Alex-Code
2012-10-29 18:13:20 +00:00
parent 679bec7baf
commit df4f80d306
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/web/CClientScript.php
View File

@@ -643,16 +643,18 @@ class CClientScript extends CApplicationComponent
* @param string $name name attribute of the meta tag. If null, the attribute will not be generated
* @param string $httpEquiv http-equiv attribute of the meta tag. If null, the attribute will not be generated
* @param array $options other options in name-value pairs (e.g. 'scheme', 'lang')
* @param string $id Optional id of the meta tag to avoid duplicates
* @return CClientScript the CClientScript object itself (to support method chaining, available since version 1.1.5).
*/
public function registerMetaTag($content,$name=null,$httpEquiv=null,$options=array())
public function registerMetaTag($content,$name=null,$httpEquiv=null,$options=array(),$id=null)
{
$this->hasScripts=true;
if($name!==null)
$options['name']=$name;
if($httpEquiv!==null)
$options['http-equiv']=$httpEquiv;
$this->metaTags[serialize($options)]=array_merge($options, array('content'=>$content));
$options['content']=$content;
$this->metaTags[null===$id?count($this->metaTags):$key]=$options;
$params=func_get_args();
$this->recordCachingAction('clientScript','registerMetaTag',$params);
return $this;