Refactoring

12 years ago · ef9ceafdca
1 changed files with 2 additions and 5 deletions
--- a/framework/yii/helpers/base/Html.php
+++ b/framework/yii/helpers/base/Html.php
@ -152,11 +152,8 @@ class Html
 	 */
 	public static function tag($name, $content = '', $options = array())
 	{
-		if (isset(static::$voidElements[strtolower($name)])) {
+		$html = "<$name" . static::renderTagAttributes($options) . '>';
-			return static::beginTag($name, $options);
+		return isset(static::$voidElements[strtolower($name)]) ? $html : "$html$content</$name>";
 		} else {
 			return static::beginTag($name, $options) . $content . static::endTag($name);
 		}
 	}
 	/**