Merge "Travis CI: Drop 5.3 as a build target"

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

index cf8b3fc..86bd979 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -86,12 +86,6 @@ class SkinTemplate extends Skin {
          */
         public $template = 'QuickTemplate';
  
-       /**
-        * @var bool Whether this skin use OutputPage::headElement() to generate
-        *   the "<head>" tag.
-        */
-       public $useHeadElement = false;
-
         /**
          * Add specific styles for this skin
          *
@@ -290,26 +284,6 @@ class SkinTemplate extends Skin {
                 $out = $this->getOutput();
                 $tpl = $this->setupTemplateForOutput();
  
-               wfProfileIn( __METHOD__ . '-stuff-head' );
-               if ( !$this->useHeadElement ) {
-                       $tpl->set( 'pagecss', false );
-                       $tpl->set( 'usercss', false );
-
-                       $tpl->set( 'userjs', false );
-                       $tpl->set( 'userjsprev', false );
-
-                       $tpl->set( 'jsvarurl', false );
-
-                       $tpl->set( 'xhtmldefaultnamespace', 'http://www.w3.org/1999/xhtml' );
-                       $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
-                       $tpl->set( 'html5version', $wgHtml5Version );
-                       $tpl->set( 'headlinks', $out->getHeadLinks() );
-                       $tpl->set( 'csslinks', $out->buildCssLinks() );
-                       $tpl->set( 'pageclass', $this->getPageClasses( $title ) );
-                       $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
-               }
-               wfProfileOut( __METHOD__ . '-stuff-head' );
-
                 wfProfileIn( __METHOD__ . '-stuff2' );
                 $tpl->set( 'title', $out->getPageTitle() );
                 $tpl->set( 'pagetitle', $out->getHTMLTitle() );
@@ -540,11 +514,7 @@ class SkinTemplate extends Skin {
                 $tpl->set( 'nav_urls', $this->buildNavUrls() );
  
                 // Set the head scripts near the end, in case the above actions resulted in added scripts
-               if ( $this->useHeadElement ) {
-                       $tpl->set( 'headelement', $out->headElement( $this ) );
-               } else {
-                       $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
-               }
+               $tpl->set( 'headelement', $out->headElement( $this ) );
  
                 $tpl->set( 'debug', '' );
                 $tpl->set( 'debughtml', $this->generateDebugHTML() );
@@ -1987,7 +1957,6 @@ abstract class BaseTemplate extends QuickTemplate {
                         'name' => 'search',
                         'placeholder' => wfMessage( 'searchsuggest-search' )->text(),
                         'value' => $this->get( 'search', '' ),
-                       'tabindex' => 1
                 );
                 $realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs );
                 return Html::element( 'input', $realAttrs );