[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[7412] site-src/trunk/mediawiki

[<uck...@us...>]

Revision: 7412
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7412&view=rev
Author:   uckelman
Date:     2010-10-16 12:52:08 +0000 (Sat, 16 Oct 2010)

Log Message:
-----------
Updated to Mediawiki 1.15.4.

Modified Paths:
--------------
    site-src/trunk/mediawiki/includes/mime.types
    site-src/trunk/mediawiki/includes/mime.types.orig
    site-src/trunk/mediawiki/opensearch_desc.php.orig

Modified: site-src/trunk/mediawiki/includes/mime.types
===================================================================
--- site-src/trunk/mediawiki/includes/mime.types	2010-10-15 21:29:00 UTC (rev 7411)
+++ site-src/trunk/mediawiki/includes/mime.types	2010-10-16 12:52:08 UTC (rev 7412)
@@ -137,4 +137,4 @@
 application/vnd.oasis.opendocument.formula odf
 application/vnd.oasis.opendocument.formula-template otf
 application/vnd.oasis.opendocument.text-master odm
-application/vnd.oasis.opendocument.text-web oth
+application/vnd.oasis.opendocument.text-web oth
\ No newline at end of file

Modified: site-src/trunk/mediawiki/includes/mime.types.orig
===================================================================
--- site-src/trunk/mediawiki/includes/mime.types.orig	2010-10-15 21:29:00 UTC (rev 7411)
+++ site-src/trunk/mediawiki/includes/mime.types.orig	2010-10-16 12:52:08 UTC (rev 7412)
@@ -133,4 +133,4 @@
 application/vnd.oasis.opendocument.formula odf
 application/vnd.oasis.opendocument.formula-template otf
 application/vnd.oasis.opendocument.text-master odm
-application/vnd.oasis.opendocument.text-web oth
+application/vnd.oasis.opendocument.text-web oth
\ No newline at end of file

Modified: site-src/trunk/mediawiki/opensearch_desc.php.orig
===================================================================
--- site-src/trunk/mediawiki/opensearch_desc.php.orig	2010-10-15 21:29:00 UTC (rev 7411)
+++ site-src/trunk/mediawiki/opensearch_desc.php.orig	2010-10-16 12:52:08 UTC (rev 7412)
@@ -6,8 +6,7 @@
  * @file
  */
 
-#require_once( dirname(__FILE__) . '/includes/WebStart.php' );
-require_once( '/usr/share/mediawiki/includes/WebStart.php' );
+require_once( dirname(__FILE__) . '/includes/WebStart.php' );
 
 if( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) {
 	// Makes testing tweaks about a billion times easier


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn