Skip to content

SLOP-393: replace removed MWNamespace class; drop dead page_counter reference #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosfos wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −4
Open

SLOP-393: replace removed MWNamespace class; drop dead page_counter reference #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/WatchAnalyticsPageTablePager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function __construct( $page, $conds, $filters = [] ) {
}

public function getQueryInfo() {
$namespaces = MWNamespace::getCanonicalNamespaces();
$namespaces = MediaWikiServices::getInstance()->getNamespaceInfo()->getCanonicalNamespaces();

if ( $this->mQueryNamespace !== null
&& $this->mQueryNamespace >= 0
Expand Down
5 changes: 2 additions & 3 deletions includes/WatchAnalyticsParserFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ public static function renderWatchersNeeded( &$parser, $frame, $args ) {
p.page_title AS page_title,
p.page_namespace AS page_namespace,
SUM( IF(w.wl_title IS NOT NULL, 1, 0) ) AS num_watches,
SUM( IF(w.wl_user = $wgUserId, 1, 0) ) AS wg_user_watches,
p.page_counter / SUM( IF(w.wl_title IS NOT NULL, 1, 0) ) AS view_watch_ratio
SUM( IF(w.wl_user = $wgUserId, 1, 0) ) AS wg_user_watches
FROM
watchlist AS w
LEFT JOIN page AS p ON
Expand All @@ -178,7 +177,7 @@ public static function renderWatchersNeeded( &$parser, $frame, $args ) {
GROUP BY
p.page_title, p.page_namespace
ORDER BY
view_watch_ratio DESC
num_watches ASC
) AS tmp
WHERE
num_watches <= $maxWatchers
Expand Down