[go: nahoru, domu]

Skip to content

Commit

Permalink
Merge pull request Wikia#5793 from Wikia/CON-2326-release255
Browse files Browse the repository at this point in the history
Con 2326 release255
  • Loading branch information
Damian Jóźwiak committed Dec 16, 2014
2 parents 41327c7 + 66be706 commit 07e6f30
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 25 deletions.
5 changes: 5 additions & 0 deletions extensions/wikia/GlobalNavigation/GlobalNavigation.setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@
$wgAutoloadClasses[ 'GlobalNavigationController' ] = __DIR__ . '/GlobalNavigationController.class.php';
$wgAutoloadClasses[ 'GlobalNavigationAccountNavigationController' ] = __DIR__ . '/GlobalNavigationAccountNavigationController.class.php';
$wgAutoloadClasses[ 'GlobalNavigationHelper' ] = __DIR__ . '/GlobalNavigationHelper.class.php';
$wgAutoloadClasses[ 'GlobalNavigationHooks' ] = __DIR__ . '/GlobalNavigationHooks.class.php';


$wgHooks['ResourceLoaderGetConfigVarsWithContext'][] = 'GlobalNavigationHooks::onResourceLoaderGetConfigVarsWithContext';
$wgHooks['OutputPageParserOutput'][] = 'GlobalNavigationHooks::onOutputPageParserOutput';

$wgExtensionMessagesFiles[ 'GlobalNavigation' ] = __DIR__ . '/GlobalNavigation.i18n.php';
32 changes: 32 additions & 0 deletions extensions/wikia/GlobalNavigation/GlobalNavigationHooks.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

class GlobalNavigationHooks {

//In case monobook skin is selected we need to set wgMWSuggestTemplate variable.
//By default wgEnableMWSuggest is disabled when GlobalNav extension is enabled.
//ResourceLoaderStartUpModule operates on different web request than main context.
//That's why changing wgEnableMWSuggest to true in hook is not enough
static public function onResourceLoaderGetConfigVarsWithContext(&$vars, $context) {
global $wgUseAjax;
$skin = $context->getSkin();

if ($skin == 'monobook' || $skin == 'uncyclopedia') {
if (!empty($wgUseAjax)) {
$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
}
}

return true;
}

//In case of monobook, GlobalNavigation is not present and we want to show to users MW suggestions.
static public function onOutputPageParserOutput( OutputPage &$out, ParserOutput $parseroutput ) {
global $wgEnableMWSuggest;
$skin = $out->getSkin()->getSkinName();

if ($skin == 'monobook' || $skin == 'uncyclopedia') {
$wgEnableMWSuggest = true;
}
return true;
}
}
31 changes: 6 additions & 25 deletions includes/OutputPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -2598,37 +2598,18 @@ private function addDefaultModules() {
if ( $wgUseAjax ) {
# macbre: following files are part of merged JS for following skins - don't load them from here
$skinName = get_class( $skin );
$skipWikiaSkins = array(
/*
'SkinMonoBook',
'SkinUncyclopedia',
'SkinMonaco',
'SkinAnswers',
'SkinCorporate',
'SkinCorporateHome',
'SkinCorporateHubs',
'SkinLyricsMinimal',
*/
// 'SkinOasis',
);

if( !in_array( $skinName, $skipWikiaSkins ) ) {
$this->addModules( 'mediawiki.legacy.ajax' );
}

$this->addModules( 'mediawiki.legacy.ajax' );

wfRunHooks( 'AjaxAddScript', array( &$this ) );


if( !in_array( $skinName, $skipWikiaSkins ) ) {
if( $wgAjaxWatch && $this->getUser()->isLoggedIn() ) {
$this->addModules( 'mediawiki.action.watch.ajax' );
}
if( $wgAjaxWatch && $this->getUser()->isLoggedIn() ) {
$this->addModules( 'mediawiki.action.watch.ajax' );
}

if( !in_array( $skinName, $skipWikiaSkins ) ) {
if ( $wgEnableMWSuggest && !$this->getUser()->getOption( 'disablesuggest', false ) ) {
$this->addModules( 'mediawiki.legacy.mwsuggest' );
}
if ( $wgEnableMWSuggest && !$this->getUser()->getOption( 'disablesuggest', false ) ) {
$this->addModules( 'mediawiki.legacy.mwsuggest' );
}
}

Expand Down
2 changes: 2 additions & 0 deletions includes/resourceloader/ResourceLoaderStartUpModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,13 @@ protected function getConfig( $context ) {
'wgSassParams' => SassUtil::getSassSettings(),
// Wikia - change end
);

if ( $wgUseAjax && $wgEnableMWSuggest ) {
$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
}

wfRunHooks( 'ResourceLoaderGetConfigVars', array( &$vars ) );
wfRunHooks( 'ResourceLoaderGetConfigVarsWithContext', array( &$vars, $context ) );

return $vars;
}
Expand Down

0 comments on commit 07e6f30

Please sign in to comment.