Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…orechek-master"

This reverts commit c667065, reversing
changes made to 903c0a9.
  • Loading branch information...
commit 1b8c6d4d173fdc8fc3d2aa7b4e5f937c90b087b5 1 parent 6edf25f
@samdark samdark authored
Showing with 2 additions and 5 deletions.
  1. +2 −5 framework/web/CClientScript.php
View
7 framework/web/CClientScript.php
@@ -372,10 +372,7 @@ public function renderHead(&$output)
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 @@ public function addPackage($name,$definition)
$this->packages[$name]=$definition;
return $this;
}
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.