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 changes I8b6b8510,I1cae6174
[lhc/web/wiklou.git]
/
includes
/
changes
/
EnhancedChangesList.php
diff --git
a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index
4837525
..
1727da0
100644
(file)
--- a/
includes/changes/EnhancedChangesList.php
+++ b/
includes/changes/EnhancedChangesList.php
@@
-57,14
+57,9
@@
class EnhancedChangesList extends ChangesList {
public function recentChangesLine( &$baseRC, $watched = false ) {
wfProfileIn( __METHOD__ );
public function recentChangesLine( &$baseRC, $watched = false ) {
wfProfileIn( __METHOD__ );
- # Create a specialised object
- $cacheEntry = RCCacheEntry::newFromParent( $baseRC );
-
- $curIdEq = array( 'curid' => $cacheEntry->mAttribs['rc_cur_id'] );
-
# If it's a new day, add the headline and flush the cache
$date = $this->getLanguage()->userDate(
# If it's a new day, add the headline and flush the cache
$date = $this->getLanguage()->userDate(
- $
cacheEntry
->mAttribs['rc_timestamp'],
+ $
baseRC
->mAttribs['rc_timestamp'],
$this->getUser()
);
$this->getUser()
);
@@
-78,6
+73,11
@@
class EnhancedChangesList extends ChangesList {
$this->lastdate = $date;
}
$this->lastdate = $date;
}
+ # Create a specialised object
+ $cacheEntry = RCCacheEntry::newFromParent( $baseRC );
+
+ $curIdEq = array( 'curid' => $cacheEntry->mAttribs['rc_cur_id'] );
+
# Should patrol-related stuff be shown?
$cacheEntry->unpatrolled = $this->showAsUnpatrolled( $cacheEntry );
# Should patrol-related stuff be shown?
$cacheEntry->unpatrolled = $this->showAsUnpatrolled( $cacheEntry );
@@
-433,6
+433,7
@@
class EnhancedChangesList extends ChangesList {
$r .= $users;
$r .= $this->numberofWatchingusers( $block[0]->numberofWatchingusers );
$r .= $users;
$r .= $this->numberofWatchingusers( $block[0]->numberofWatchingusers );
+ $r .= '</td></tr>';
# Sub-entries
foreach ( $block as $rcObj ) {
# Sub-entries
foreach ( $block as $rcObj ) {