documentation, a couple notes about code and some whitespaces adjustements to make...

[lhc/web/wiklou.git] / includes / Html.php
diff --git a/includes/Html.php b/includes/Html.php

index fea5fb7..20d7ef5 100644 (file)
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -571,10 +571,12 @@ class Html {
                 global $wgHtml5;
                 $attribs['name'] = $name;
                 if ( !$wgHtml5 ) {
-                       if ( !isset( $attribs['cols'] ) )
+                       if ( !isset( $attribs['cols'] ) ) {
                                 $attribs['cols'] = "";
-                       if ( !isset( $attribs['rows'] ) )
+                       }
+                       if ( !isset( $attribs['rows'] ) ) {
                                 $attribs['rows'] = "";
+                       }
                 }
                 return self::element( 'textarea', $attribs, $value );
         }
@@ -595,7 +597,7 @@ class Html {
                         $ret .= "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
                 }
  
-               global $wgHtml5, $wgHtml5Version, $wgWellFormedXml, $wgDocType, $wgDTD;
+               global $wgHtml5, $wgHtml5Version, $wgDocType, $wgDTD;
                 global $wgXhtmlNamespaces, $wgXhtmlDefaultNamespace;
                 if ( $wgHtml5 ) {
                         $ret .= "<!DOCTYPE html>\n";
@@ -609,7 +611,12 @@ class Html {
                                 $attribs["xmlns:$tag"] = $ns;
                         }
                 }
-               return $ret . Html::openElement( 'html', $attribs ) . "\n";
+               $html = Html::openElement( 'html', $attribs );
+               if ( $html ) {
+                       $html .= "\n";
+               }
+               $ret .= $html;
+               return $ret;
         }
  
         /**
@@ -620,12 +627,12 @@ class Html {
          */
         public static function isXmlMimeType( $mimetype ) {
                 switch ( $mimetype ) {
-               case 'text/xml':
-               case 'application/xhtml+xml':
-               case 'application/xml':
-                       return true;
-               default:
-                       return false;
+                       case 'text/xml':
+                       case 'application/xhtml+xml':
+                       case 'application/xml':
+                               return true;
+                       default:
+                               return false;
                 }
         }
  }