Merge "Revert "Remove useless $out parameter from SkinTemplate::prepareQuickTemplate()""

diff --combined includes/skins/SkinTemplate.php
index b6077b3,867d8ec..93845aa
--- 1/includes/skins/SkinTemplate.php
--- 2/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@@ -271,7 -271,7 +271,7 @@@ class SkinTemplate extends Skin 
                wfProfileIn( __METHOD__ . '-init' );
                $this->initPage( $out );
                wfProfileOut( __METHOD__ . '-init' );
-               $tpl = $this->prepareQuickTemplate();
+               $tpl = $this->prepareQuickTemplate( $out );
                // execute template
                wfProfileIn( __METHOD__ . '-execute' );
                $res = $tpl->execute();
@@@ -1375,9 -1375,8 +1375,9 @@@ abstract class QuickTemplate 
  
        /** @var Config $config */
        protected $config;
 +
        /**
 -       * @var Config $config
 +       * @param Config $config
         */
        function __construct( Config $config = null ) {
                $this->data = array();