Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

screw global defines :)

Browse source
This commit is contained in:
Domas Mituzas 2006-06-08 13:21:42 +00:00
parent 9ff370792b
commit f6efd8b094
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/Block.php
View file

@ -4,13 +4,6 @@
* @package MediaWiki
*/
/**
* Some globals
*/
define ( 'EB_KEEP_EXPIRED', 1 );
define ( 'EB_FOR_UPDATE', 2 );
define ( 'EB_RANGE_ONLY', 4 );
/**
* The block class
* All the functions in this class assume the object is either explicitly
@ -27,6 +20,10 @@ class Block
/* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry,
$mRangeStart, $mRangeEnd;
/* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster, $mByName;
const EB_KEEP_EXPIRED = 1;
const EB_FOR_UPDATE = 2;
const EB_RANGE_ONLY = 4;
function Block( $address = '', $user = '', $by = 0, $reason = '',
$timestamp = '' , $auto = 0, $expiry = '' )
@ -258,7 +255,7 @@ class Block
global $wgAntiLockFlags;
$block = new Block();
if ( $flags & EB_FOR_UPDATE ) {
if ( $flags & Block::EB_FOR_UPDATE ) {
$db =& wfGetDB( DB_MASTER );
if ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) {
$options = '';
@ -270,7 +267,7 @@ class Block
$db =& wfGetDB( DB_SLAVE );
$options = '';
}
if ( $flags & EB_RANGE_ONLY ) {
if ( $flags & Block::EB_RANGE_ONLY ) {
$cond = " AND ipb_range_start <> ''";
} else {
$cond = '';
@ -287,11 +284,11 @@ class Block
while ( $row = $db->fetchObject( $res ) ) {
$block->initFromRow( $row );
if ( ( $flags & EB_RANGE_ONLY ) && $block->mRangeStart == '' ) {
if ( ( $flags & Block::EB_RANGE_ONLY ) && $block->mRangeStart == '' ) {
continue;
}
if ( !( $flags & EB_KEEP_EXPIRED ) ) {
if ( !( $flags & Block::EB_KEEP_EXPIRED ) ) {
if ( $block->mExpiry && $now > $block->mExpiry ) {
$block->delete();
} else {