https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112984
Revision: 112984
Author: aaron
Date: 2012-03-04 21:08:55 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
Added some super calls to constructors to be safe
Modified Paths:
--------------
trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
2012-03-04 20:58:10 UTC (rev 112983)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
2012-03-04 21:08:55 UTC (rev 112984)
@@ -55,6 +55,8 @@
* @param Array $config
*/
public function __construct( array $config ) {
+ parent::__construct( $config );
+
$this->dbServers = isset( $config['dbServers'] )
? $config['dbServers']
: array(); // likely just using 'localDBMaster'
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
2012-03-04 20:58:10 UTC (rev 112983)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
2012-03-04 21:08:55 UTC (rev 112984)
@@ -35,6 +35,7 @@
*/
function __construct( array $config ) {
parent::__construct( $config );
+
$this->lockDir = $config['lockDirectory'];
}
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
2012-03-04 20:58:10 UTC (rev 112983)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
2012-03-04 21:08:55 UTC (rev 112984)
@@ -50,6 +50,8 @@
* @param Array $config
*/
public function __construct( array $config ) {
+ parent::__construct( $config );
+
$this->lockServers = $config['lockServers'];
// Sanitize srvsByBucket config to prevent PHP errors
$this->srvsByBucket = array_filter( $config['srvsByBucket'],
'is_array' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs