Merge changes I949eebf8,Iba69ee62

* changes:
  Use mediawiki.org as the default source in production
  Revert "Added localhost to available sources and made it default"
This commit is contained in:
Trevor Parscal 2012-06-21 03:38:25 +00:00 committed by Gerrit Code Review
commit 8d977b236d

View file

@ -9,9 +9,10 @@
*/ */
// default to en.wikipedia.org // default to en.wikipedia.org
var defaultInterwiki = 'en'; //var defaultInterwiki = 'en';
// alternative: default to www.mediawiki.org // alternative: default to www.mediawiki.org
//var defaultInterwiki = 'mw'; // Use this in production for now
var defaultInterwiki = 'mw';
// for development: default to localhost // for development: default to localhost
//var defaultInterwiki = 'localhost'; //var defaultInterwiki = 'localhost';
@ -50,10 +51,6 @@ env.addInterwiki( 'mw', 'http://www.mediawiki.org/w' );
// For development: // For development:
//env.addInterwiki( 'localhost', 'http://localhost/w' ); //env.addInterwiki( 'localhost', 'http://localhost/w' );
// add localhost and make it the default
env.addInterwiki( 'localhost', 'http://localhost/mediawiki' );
defaultInterwiki = 'localhost';
var parserPipelineFactory = new ParserPipelineFactory( env ); var parserPipelineFactory = new ParserPipelineFactory( env );
//var parser = parserPipelineFactory.makePipeline( 'text/x-mediawiki/full' ); //var parser = parserPipelineFactory.makePipeline( 'text/x-mediawiki/full' );