-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1

Andrew Miller wrote:

Hi, This is my first contribution to WikiMedia, so please forgive me(and tell me what to do in the future) if this is the wrong list for patches, or I have not correctly followed your coding style conventions.

Hello Andrew,

You should probably send patch for mediawiki in mediawiki-l :o)

I commited in HEAD and REL1_4 your hunks for: * config/index.php : accessing group private propriety directly and the wgWhitelistRead thing. * Group.php : additional check for $dbr status

The patch makes config/index.php work out of the box(before it failed with a database error). To get this to work, I had to make LoadBalancer.php honour $wgUseDatabaseMessages = false(the code is only run if the database connection has already failed, so there is no slowdown except in error situations). I also had to modify User.php so that a wgDebugDieBacktrace is not called when $wgUseDatabaseMessages = false. Again, this does not affect the "usual" path of execution. I added a $dbr == null check in Group.php, this does affect the usual path of execution, but is probably a check we should have anyway.

I also fixed some old and/or unnecessary code in config/index.php

Patch follows(-rbud options):

I did not apply the $wgCommandLineMode = true in index.php cause it's not true :o) Need to find another way to use that :o)

Index: config/index.php

RCS file: /cvsroot/wikipedia/phase3/config/index.php,v retrieving revision 1.89 diff -b -u -d -r1.89 index.php --- config/index.php 28 Dec 2004 14:49:41 -0000 1.89 +++ config/index.php 15 Jan 2005 00:17:12 -0000 @@ -405,7 +405,6 @@ $wgDBadminuser = "root"; $wgDBadminpassword = $conf->RootPW; $wgDBprefix = $conf->DBprefix;

•    $wgCommandLineMode = true;
     $wgUseDatabaseMessages = false;    /* FIXME: For database 
  

failure */ require_once( "includes/Setup.php" ); chdir( "config" );

<snip hunks applied>

I did not apply the other parts concerning $wgUseDatabaseMessages cause I am too tired right now to check them and don't really understand them :o) Will have a look at them later if nobody did it. <snip $wgUseDatabaseMessages>

cheers,

- -- Ashar Voultoiz - WP++++ http://en.wikipedia.org/wiki/User:Hashar http://www.livejournal.com/community/wikitech/ Servers in trouble ? noc (at) wikimedia (dot) org