http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84532
Revision: 84532
Author: demon
Date: 2011-03-22 15:59:50 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Cleanup r80892, r84485: Check user also in sqlite for consistency.
Modified Paths:
--------------
trunk/phase3/includes/db/DatabaseIbm_db2.php
trunk/phase3/includes/db/DatabaseSqlite.php
Modified: trunk/phase3/includes/db/DatabaseIbm_db2.php
===================================================================
--- trunk/phase3/includes/db/DatabaseIbm_db2.php 2011-03-22 15:47:53 UTC
(rev 84531)
+++ trunk/phase3/includes/db/DatabaseIbm_db2.php 2011-03-22 15:59:50 UTC
(rev 84532)
@@ -245,11 +245,6 @@
return 'ibm_db2';
}
- ######################################
- # Setup
- ######################################
-
-
/**
*
* @param $server String: hostname of database server
Modified: trunk/phase3/includes/db/DatabaseSqlite.php
===================================================================
--- trunk/phase3/includes/db/DatabaseSqlite.php 2011-03-22 15:47:53 UTC (rev
84531)
+++ trunk/phase3/includes/db/DatabaseSqlite.php 2011-03-22 15:59:50 UTC (rev
84532)
@@ -26,8 +26,8 @@
function __construct( $server = false, $user = false, $password =
false, $dbName = false, $flags = 0 ) {
$this->mName = $dbName;
parent::__construct( $server, $user, $password, $dbName, $flags
);
- // parent doesn't open when $server is false, but we can work
with $dbName
- if( !$server && $dbName ) {
+ // parent doesn't open when $user is false, but we can work
with $dbName
+ if( !$user && $dbName ) {
global $wgSharedDB;
if( $this->open( $server, $user, $password, $dbName )
&& $wgSharedDB ) {
$this->attachDatabase( $wgSharedDB );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
