dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use current content model for blank page content (not title default)
[lhc/web/wiklou.git]
/
includes
/
WatchedItem.php
diff --git
a/includes/WatchedItem.php
b/includes/WatchedItem.php
index
0495536
..
b070e1e
100644
(file)
--- a/
includes/WatchedItem.php
+++ b/
includes/WatchedItem.php
@@
-18,6
+18,8
@@
* @file
* @ingroup Watchlist
*/
* @file
* @ingroup Watchlist
*/
+use MediaWiki\MediaWikiServices;
+use MediaWiki\Linker\LinkTarget;
/**
* Representation of a pair of user and title for watchlist entries.
/**
* Representation of a pair of user and title for watchlist entries.
@@
-117,7
+119,7
@@
class WatchedItem {
if ( $this->checkRights && !$this->user->isAllowed( 'viewmywatchlist' ) ) {
return false;
}
if ( $this->checkRights && !$this->user->isAllowed( 'viewmywatchlist' ) ) {
return false;
}
- $item =
WatchedItemStore::getDefaultInstanc
e()
+ $item =
MediaWikiServices::getInstance()->getWatchedItemStor
e()
->loadWatchedItem( $this->user, $this->linkTarget );
if ( $item ) {
$this->notificationTimestamp = $item->getNotificationTimestamp();
->loadWatchedItem( $this->user, $this->linkTarget );
if ( $item ) {
$this->notificationTimestamp = $item->getNotificationTimestamp();
@@
-140,11
+142,7
@@
class WatchedItem {
*/
public function getTitle() {
if ( !$this->title ) {
*/
public function getTitle() {
if ( !$this->title ) {
- if ( $this->linkTarget instanceof Title ) {
- $this->title = $this->linkTarget;
- } else {
- $this->title = Title::newFromLinkTarget( $this->linkTarget );
- }
+ $this->title = Title::newFromLinkTarget( $this->linkTarget );
}
return $this->title;
}
}
return $this->title;
}
@@
-154,7
+152,7
@@
class WatchedItem {
* or WatchedItemStore::loadWatchedItem()
*/
public static function fromUserTitle( $user, $title, $checkRights = User::CHECK_USER_RIGHTS ) {
* or WatchedItemStore::loadWatchedItem()
*/
public static function fromUserTitle( $user, $title, $checkRights = User::CHECK_USER_RIGHTS ) {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
return new self( $user, $title, self::DEPRECATED_USAGE_TIMESTAMP, (bool)$checkRights );
}
return new self( $user, $title, self::DEPRECATED_USAGE_TIMESTAMP, (bool)$checkRights );
}
@@
-162,11
+160,11
@@
class WatchedItem {
* @deprecated since 1.27 Use WatchedItemStore::resetNotificationTimestamp()
*/
public function resetNotificationTimestamp( $force = '', $oldid = 0 ) {
* @deprecated since 1.27 Use WatchedItemStore::resetNotificationTimestamp()
*/
public function resetNotificationTimestamp( $force = '', $oldid = 0 ) {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
return;
}
if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
return;
}
-
WatchedItemStore::getDefaultInstanc
e()->resetNotificationTimestamp(
+
MediaWikiServices::getInstance()->getWatchedItemStor
e()->resetNotificationTimestamp(
$this->user,
$this->getTitle(),
$force,
$this->user,
$this->getTitle(),
$force,
@@
-178,7
+176,7
@@
class WatchedItem {
* @deprecated since 1.27 Use WatchedItemStore::addWatchBatch()
*/
public static function batchAddWatch( array $items ) {
* @deprecated since 1.27 Use WatchedItemStore::addWatchBatch()
*/
public static function batchAddWatch( array $items ) {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
if ( !$items ) {
return false;
}
if ( !$items ) {
return false;
}
@@
-197,7
+195,7
@@
class WatchedItem {
$targets[$userId][] = $watchedItem->getTitle()->getTalkPage();
}
$targets[$userId][] = $watchedItem->getTitle()->getTalkPage();
}
- $store =
WatchedItemStore::getDefaultInstanc
e();
+ $store =
MediaWikiServices::getInstance()->getWatchedItemStor
e();
$success = true;
foreach ( $users as $userId => $user ) {
$success &= $store->addWatchBatchForUser( $user, $targets[$userId] );
$success = true;
foreach ( $users as $userId => $user ) {
$success &= $store->addWatchBatchForUser( $user, $targets[$userId] );
@@
-211,7
+209,7
@@
class WatchedItem {
* @return bool
*/
public function addWatch() {
* @return bool
*/
public function addWatch() {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
$this->user->addWatch( $this->getTitle(), $this->checkRights );
return true;
}
$this->user->addWatch( $this->getTitle(), $this->checkRights );
return true;
}
@@
-221,7
+219,7
@@
class WatchedItem {
* @return bool
*/
public function removeWatch() {
* @return bool
*/
public function removeWatch() {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
return false;
}
if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
return false;
}
@@
-234,7
+232,7
@@
class WatchedItem {
* @return bool
*/
public function isWatched() {
* @return bool
*/
public function isWatched() {
-
//
wfDeprecated( __METHOD__, '1.27' );
+ wfDeprecated( __METHOD__, '1.27' );
return $this->user->isWatched( $this->getTitle(), $this->checkRights );
}
return $this->user->isWatched( $this->getTitle(), $this->checkRights );
}
@@
-242,8
+240,8
@@
class WatchedItem {
* @deprecated since 1.27 Use WatchedItemStore::duplicateAllAssociatedEntries()
*/
public static function duplicateEntries( Title $oldTitle, Title $newTitle ) {
* @deprecated since 1.27 Use WatchedItemStore::duplicateAllAssociatedEntries()
*/
public static function duplicateEntries( Title $oldTitle, Title $newTitle ) {
-
//
wfDeprecated( __METHOD__, '1.27' );
- $store =
WatchedItemStore::getDefaultInstanc
e();
+ wfDeprecated( __METHOD__, '1.27' );
+ $store =
MediaWikiServices::getInstance()->getWatchedItemStor
e();
$store->duplicateAllAssociatedEntries( $oldTitle, $newTitle );
}
$store->duplicateAllAssociatedEntries( $oldTitle, $newTitle );
}