* timestamp string The time at which the block comes into effect
* byText string Username of the blocker (for foreign users)
*/
- function __construct( $options = [] ) {
+ public function __construct( array $options = [] ) {
$defaults = [
'address' => '',
'by' => null,
* @return array
*/
public function getBlockErrorParams( IContextSource $context ) {
+ $lang = $context->getLanguage();
+
$blocker = $this->getBlocker();
if ( $blocker instanceof User ) { // local user
$blockerUserpage = $blocker->getUserPage();
- $link = "[[{$blockerUserpage->getPrefixedText()}|{$blockerUserpage->getText()}]]";
+ $blockerText = $lang->embedBidi( $blockerUserpage->getText() );
+ $link = "[[{$blockerUserpage->getPrefixedText()}|{$blockerText}]]";
} else { // foreign user
$link = $blocker;
}
/* $ip returns who *is* being blocked, $intended contains who was meant to be blocked.
* This could be a username, an IP range, or a single IP. */
- $intended = $this->getTarget();
- $lang = $context->getLanguage();
+ $intended = (string)$this->getTarget();
return [
$link,
$reason,
$context->getRequest()->getIP(),
- $this->getByName(),
+ $lang->embedBidi( $this->getByName() ),
// TODO: SystemBlock replaces this with the system block type. Clean up
// error params so that this is not necessary.
$this->getId(),
$lang->formatExpiry( $this->getExpiry() ),
- (string)$intended,
+ $lang->embedBidi( $intended ),
$lang->userTimeAndDate( $this->getTimestamp(), $context->getUser() ),
];
}
* Check if the block should be tracked with a cookie.
*
* @since 1.33
+ * @deprecated since 1.34 Use BlockManager::trackBlockWithCookie instead
+ * of calling this directly.
* @param bool $isAnon The user is logged out
* @return bool The block should be tracked with a cookie
*/
public function shouldTrackWithCookie( $isAnon ) {
+ wfDeprecated( __METHOD__, '1.34' );
return false;
}