Fix Bug #28344 - “Links doesn't work inside collapsible toggles”
[lhc/web/wiklou.git] / index.php
index 36c9974..66693c5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -130,14 +130,14 @@ function wfIndexMain() {
                        $cache = new HTMLFileCache( $wgTitle, $action );
                        if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
                                /* Check incoming headers to see if client has this cached */
-                               if ( !$context->output->checkLastModified( $cache->fileCacheTime() ) ) {
+                               if ( !$context->getOutput()->checkLastModified( $cache->fileCacheTime() ) ) {
                                        $cache->loadFromFileCache();
                                }
                                # Do any stats increment/watchlist stuff
                                $article = Article::newFromTitle( $wgTitle, $context );
                                $article->viewUpdates();
                                # Tell OutputPage that output is taken care of
-                               $context->output->disable();
+                               $context->getOutput()->disable();
                                wfProfileOut( 'index.php-filecache' );
                                $mediaWiki->finalCleanup();
                                wfProfileOut( 'index.php' );
@@ -220,7 +220,7 @@ function wfDie( $errorMsg ){
                </style>
        </head>
        <body>
-               <img src="<?php echo $logo; ?>" alt='The MediaWiki logo' />
+               <img src="<?php echo $encLogo; ?>" alt='The MediaWiki logo' />
                <h1>MediaWiki <?php echo $version; ?> internal error</h1>
                <div class='error'> <?php echo $errorMsg; ?> </div>
        </body>