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
Merge "Fix typo in Release note"
[lhc/web/wiklou.git]
/
includes
/
WatchedItem.php
diff --git
a/includes/WatchedItem.php
b/includes/WatchedItem.php
index
ab136b8
..
4d22692
100644
(file)
--- a/
includes/WatchedItem.php
+++ b/
includes/WatchedItem.php
@@
-275,7
+275,6
@@
class WatchedItem {
* @return bool
*/
public static function batchAddWatch( array $items ) {
* @return bool
*/
public static function batchAddWatch( array $items ) {
- $section = new ProfileSection( __METHOD__ );
if ( wfReadOnly() ) {
return false;
if ( wfReadOnly() ) {
return false;
@@
-331,11
+330,9
@@
class WatchedItem {
* @return bool
*/
public function removeWatch() {
* @return bool
*/
public function removeWatch() {
- wfProfileIn( __METHOD__ );
// Only loggedin user can have a watchlist
if ( wfReadOnly() || $this->mUser->isAnon() || !$this->isAllowed( 'editmywatchlist' ) ) {
// Only loggedin user can have a watchlist
if ( wfReadOnly() || $this->mUser->isAnon() || !$this->isAllowed( 'editmywatchlist' ) ) {
- wfProfileOut( __METHOD__ );
return false;
}
return false;
}
@@
-370,7
+367,6
@@
class WatchedItem {
$this->watched = false;
$this->watched = false;
- wfProfileOut( __METHOD__ );
return $success;
}
return $success;
}
@@
-401,7
+397,8
@@
class WatchedItem {
$newtitle = $nt->getDBkey();
$dbw = wfGetDB( DB_MASTER );
$newtitle = $nt->getDBkey();
$dbw = wfGetDB( DB_MASTER );
- $res = $dbw->select( 'watchlist', 'wl_user',
+ $res = $dbw->select( 'watchlist',
+ array( 'wl_user', 'wl_notificationtimestamp' ),
array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ),
__METHOD__, 'FOR UPDATE'
);
array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ),
__METHOD__, 'FOR UPDATE'
);
@@
-411,7
+408,8
@@
class WatchedItem {
$values[] = array(
'wl_user' => $s->wl_user,
'wl_namespace' => $newnamespace,
$values[] = array(
'wl_user' => $s->wl_user,
'wl_namespace' => $newnamespace,
- 'wl_title' => $newtitle
+ 'wl_title' => $newtitle,
+ 'wl_notificationtimestamp' => $s->wl_notificationtimestamp,
);
}
);
}