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

Revert "Merge branch 'master' of git://github.com/horechek/yii into horechek-master"

Browse Source 
This reverts commit c6670657b7, reversing
changes made to 903c0a991f.
This commit is contained in:
Alexander Makarov
2013-03-06 03:59:36 +04:00
parent 6edf25f97d
commit 1b8c6d4d17
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/web/CClientScript.php
View File

@@ -372,10 +372,7 @@ class CClientScript extends CApplicationComponent
if($html!=='')
{
$count=0;
$output=preg_replace('/(<\\/head\s*>)/is','<###head###>$1',$output,1,$count);
if(!$count)
$output=preg_replace('/(<\\/title\s*>)/is','$1<###head###>',$output,1,$count);
$output=preg_replace('/(<title\b[^>]*>|<\\/head\s*>)/is','<###head###>$1',$output,1,$count);
if($count)
$output=str_replace('<###head###>',$html,$output);
else
@@ -774,4 +771,4 @@ class CClientScript extends CApplicationComponent
$this->packages[$name]=$definition;
return $this;
}
}
}