Remove unused initial_setup(), last $wgDBts2schema user. Follow up to r81132

[lhc/web/wiklou.git] / includes / WatchlistEditor.php

diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php
index 8850d26..b5a994d 100644 (file)
--- a/includes/WatchlistEditor.php
+++ b/includes/WatchlistEditor.php
@@ -207,15 +207,17 @@ class WatchlistEditor {
        private function getWatchlistInfo( $user ) {
                $titles = array();
                $dbr = wfGetDB( DB_MASTER );
-               $uid = intval( $user->getId() );
-               list( $watchlist, $page ) = $dbr->tableNamesN( 'watchlist', 'page' );
-               $sql = "SELECT wl_namespace, wl_title, page_id, page_len, page_is_redirect, page_latest
-                       FROM {$watchlist} LEFT JOIN {$page} ON ( wl_namespace = page_namespace
-                       AND wl_title = page_title ) WHERE wl_user = {$uid}";
-               if ( ! $dbr->implicitOrderby() ) {
-                       $sql .= " ORDER BY wl_title";
-               }
-               $res = $dbr->query( $sql, __METHOD__ );
+
+               $res = $dbr->select(
+                                       array( 'watchlist', 'page' ),
+                                       array( 'wl_namespace', 'wl_title', 'page_id', 'page_len', 'page_is_redirect', 'page_latest' ),
+                                       array( 'wl_user' => $user->getId() ),
+                                       __METHOD__,
+                                       array( 'ORDER BY' => 'wl_namespace, wl_title' ),
+                                       array( 'page' =>
+                                               array( 'LEFT JOIN', 'wl_namespace = page_namespace AND wl_title = page_title' ) )
+                               );
+
                if( $res && $dbr->numRows( $res ) > 0 ) {
                        $cache = LinkCache::singleton();
                        foreach ( $res as $row ) {                      
@@ -347,7 +349,8 @@ class WatchlistEditor {
         */
        private function showNormalForm( $output, $user ) {
                global $wgUser;
-               if( ( $count = $this->showItemCount( $output, $user ) ) > 0 ) {
+               $count = $this->showItemCount( $output, $user );
+               if( $count > 0 ) {
                        $self = SpecialPage::getTitleFor( 'Watchlist' );
                        $form  = Xml::openElement( 'form', array( 'method' => 'post',
                                'action' => $self->getLocalUrl( array( 'action' => 'edit' ) ) ) );