Use protocol-relative URL for link to MediaWiki.org (as with the footer logo on each...

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 82bf442..afde02f 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -187,6 +187,11 @@ if ( $wgUseInstantCommons ) {
        );
 }
 
+if ( is_null( $wgEnableAutoRotation ) ) {
+       // Only enable auto-rotation when the bitmap handler can rotate
+       $wgEnableAutoRotation = BitmapHandler::canRotate();
+}
+
 if ( $wgRCFilterByAge ) {
        # # Trim down $wgRCLinkDays so that it only lists links which are valid
        # # as determined by $wgRCMaxAge.
@@ -315,10 +320,8 @@ if ( $wgNewUserLog ) {
        $wgLogTypes[]                        = 'newusers';
        $wgLogNames['newusers']              = 'newuserlogpage';
        $wgLogHeaders['newusers']            = 'newuserlogpagetext';
-       $wgLogActions['newusers/newusers']   = 'newuserlogentry'; // For compatibility with older log entries
-       $wgLogActions['newusers/create']     = 'newuserlog-create-entry';
-       $wgLogActions['newusers/create2']    = 'newuserlog-create2-entry';
-       $wgLogActions['newusers/autocreate'] = 'newuserlog-autocreate-entry';
+       # newusers, create, create2, autocreate
+       $wgLogActionsHandlers['newusers/*']  = 'NewUsersLogFormatter';
 }
 
 if ( $wgCookieSecure === 'detect' ) {
@@ -343,6 +346,11 @@ if ( !defined( 'MW_COMPILED' ) ) {
        wfProfileOut( $fname . '-includes' );
 }
 
+# Now that GlobalFunctions is loaded, set the default for $wgCanonicalServer
+if ( $wgCanonicalServer === false ) {
+       $wgCanonicalServer = wfExpandUrl( $wgServer, PROTO_HTTP );
+}
+
 wfProfileIn( $fname . '-misc1' );
 
 # Raise the memory limit if it's too low