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

…orechek-master"

This reverts commit c667065, reversing
changes made to 903c0a9.

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;
 	}
-}
+}