$protect_description = '';
foreach ( $limit as $action => $restrictions ) {
if ( !isset( $expiry[$action] ) )
- $expiry[$action] = Block::infinity();
+ $expiry[$action] = $dbw->getInfinity();
$encodedExpiry[$action] = $dbw->encodeExpiry( $expiry[$action] );
if ( $restrictions != '' ) {
* @deprecated since 1.18; use $dbw->encodeExpiry() instead
*/
public static function encodeExpiry( $expiry, $db ) {
- if ( $expiry == '' || $expiry == Block::infinity() ) {
- return Block::infinity();
- } else {
- return $db->timestamp( $expiry );
- }
+ return $db->encodeExpiry( $expiry );
}
/**
/**
* Get a value to insert into expiry field of the database when infinite expiry
* is desired
- *
+ * @deprecated since 1.18, call $dbr->getInfinity() directly
* @return String
*/
public static function infinity() {
}
$expiry = $wgContLang->formatExpiry( $encoded_expiry, TS_MW );
- if ( $expiry == self::infinity() ) {
+ if ( $expiry == wfGetDB( DB_SLAVE )->getInfinity() ) {
$expirystr = $msg['infiniteblock'];
} else {
global $wgLang;
$blockid = $wgUser->mBlock->mId;
- $blockExpiry = $wgUser->mBlock->mExpiry;
- if ( $blockExpiry == Block::infinity() ) {
- $blockExpiry = wfMessage( 'infiniteblock' );
- } else {
- $blockExpiry = $wgLang->timeanddate(
- wfTimestamp( TS_MW, $blockExpiry ),
- true
- );
- }
+ $blockExpiry = $wgLang->formatExpiry( $wgUser->mBlock->mExpiry );
if ( $wgUser->mBlock->mAuto ) {
$msg = 'autoblockedtext';
$value = $this->mExpirySelection[$action];
}
if ( $value == 'infinite' || $value == 'indefinite' || $value == 'infinity' ) {
- $time = Block::infinity();
+ $time = wfGetDB( DB_SLAVE )->getInfinity();
} else {
$unix = strtotime( $value );
$block = Block::newFromTargetAndType( $target, $type );
if( $block instanceof Block ){
- $res['expiry'] = $block->mExpiry == Block::infinity()
+ $res['expiry'] = $block->mExpiry == wfGetDB( DB_SLAVE )->getInfinity()
? 'infinite'
: wfTimestamp( TS_ISO_8601, $block->mExpiry );
} else {
}
$restrictionTypes = $titleObj->getRestrictionTypes();
+ $dbr = wfGetDB( DB_SLAVE );
$protections = array();
$expiryarray = array();
}
if ( in_array( $expiry[$i], array( 'infinite', 'indefinite', 'never' ) ) ) {
- $expiryarray[$p[0]] = Block::infinity();
+ $expiryarray[$p[0]] = $dbr->getInfinity();
} else {
$exp = strtotime( $expiry[$i] );
if ( $exp < 0 || !$exp ) {
$expiryarray[$p[0]] = $exp;
}
$resultProtections[] = array( $p[0] => $protections[$p[0]],
- 'expiry' => ( $expiryarray[$p[0]] == Block::infinity() ?
+ 'expiry' => ( $expiryarray[$p[0]] == $dbr->getInfinity() ?
'infinite' :
wfTimestamp( TS_ISO_8601, $expiryarray[$p[0]] ) ) );
}
'validation-callback' => array( __CLASS__, 'validateTargetField' ),
),
'Expiry' => array(
- 'type' => self::getSuggestedDurations() === array() ? 'text' : 'selectorother',
+ 'type' => !count( self::getSuggestedDurations() ) ? 'text' : 'selectorother',
'label-message' => 'ipbexpiry',
'required' => true,
'tabindex' => '2',
* @return String: timestamp or "infinity" string for the DB implementation
*/
public static function parseExpiryInput( $expiry ) {
+ static $infinity;
+ if( $infinity == null ){
+ $infinity = wfGetDB( DB_READ )->getInfinity();
+ }
if ( $expiry == 'infinite' || $expiry == 'indefinite' ) {
- $expiry = Block::infinity();
+ $expiry = $infinity;
} else {
$expiry = strtotime( $expiry );
if ( $expiry < 0 || $expiry === false ) {
break;
case 'ipb_expiry':
- $formatted = $value == Block::infinity()
- ? $msg['infiniteblock']
- : $wgLang->timeanddate( $value );
+ $formatted = $wgLang->formatExpiry( $value );
if( $wgUser->isAllowed( 'block' ) ){
if( $row->ipb_auto ){
$links[] = $sk->linkKnown(
wfProfileIn( __METHOD__ );
- static $skin = null, $dbr = null;
+ static $skin = null, $infinity = null;
if( is_null( $skin ) ){
$skin = $wgUser->getSkin();
- $dbr = wfGetDB( DB_READ );
+ $infinity = wfGetDB( DB_READ )->getInfinity();
}
$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
$stxt = '';
$expiry = $wgLang->formatExpiry( $row->pr_expiry, TS_MW );
- if( $expiry != $dbr->getInfinity() ) {
+ if( $expiry != $infinity ) {
$expiry_description = wfMsg(
'protect-expiring',