Partial revert of r32982; old Title method is fine here

diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php
index 51263b5..746092e 100644 (file)
--- a/includes/LinkBatch.php
+++ b/includes/LinkBatch.php
@@ -96,7 +96,7 @@ class LinkBatch {
                $ids = array();
                $remaining = $this->data;
                while ( $row = $res->fetchObject() ) {
-                       $title = Title::newFromRow( $row );
+                       $title = Title::makeTitle( $row->page_namespace, $row->page_title );
                        $cache->addGoodLinkObj( $row->page_id, $title, $row->page_len, $row->page_is_redirect );
                        $ids[$title->getPrefixedDBkey()] = $row->page_id;
                        unset( $remaining[$row->page_namespace][$row->page_title] );

diff --git a/includes/Parser.php b/includes/Parser.php
index 3e8c9e4..8de72b8 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4026,7 +4026,7 @@ class Parser
                                # Fetch data and form into an associative array
                                # non-existent = broken
                                while ( $s = $dbr->fetchObject($res) ) {
-                                       $title = Title::newFromRow( $s );
+                                       $title = Title::makeTitle( $s->page_namespace, $s->page_title );
                                        $pdbk = $title->getPrefixedDBkey();
                                        $linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect );
                                        $this->mOutput->addLink( $title, $s->page_id );
@@ -4103,7 +4103,7 @@ class Parser
                                        // for each found variants, figure out link holders and replace
                                        while ( $s = $dbr->fetchObject($varRes) ) {
 
-                                               $variantTitle = Title::newFromRow( $s );
+                                               $variantTitle = Title::makeTitle( $s->page_namespace, $s->page_title );
                                                $varPdbk = $variantTitle->getPrefixedDBkey();
                                                $vardbk = $variantTitle->getDBkey();
 

diff --git a/includes/Parser_OldPP.php b/includes/Parser_OldPP.php
index 852f338..0f35bab 100644 (file)
--- a/includes/Parser_OldPP.php
+++ b/includes/Parser_OldPP.php
@@ -4145,7 +4145,7 @@ class Parser_OldPP
                                # 1 = known
                                # 2 = stub
                                while ( $s = $dbr->fetchObject($res) ) {
-                                       $title = Title::newFromRow( $s );
+                                       $title = Title::makeTitle( $s->page_namespace, $s->page_title );
                                        $pdbk = $title->getPrefixedDBkey();
                                        $linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect );
                                        $this->mOutput->addLink( $title, $s->page_id );
@@ -4223,7 +4223,7 @@ class Parser_OldPP
                                        // for each found variants, figure out link holders and replace
                                        while ( $s = $dbr->fetchObject($varRes) ) {
 
-                                               $variantTitle = Title::newFromRow( $s );
+                                               $variantTitle = Title::makeTitle( $s->page_namespace, $s->page_title );
                                                $varPdbk = $variantTitle->getPrefixedDBkey();
                                                $vardbk = $variantTitle->getDBkey();
 

diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php
index 9848734..90c12c4 100644 (file)
--- a/includes/WatchlistEditor.php
+++ b/includes/WatchlistEditor.php
@@ -205,15 +205,14 @@ class WatchlistEditor {
                $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_namespace, page_title 
+               $sql = "SELECT wl_namespace, wl_title, page_id, page_len, page_is_redirect
                        FROM {$watchlist} LEFT JOIN {$page} ON ( wl_namespace = page_namespace
                        AND wl_title = page_title ) WHERE wl_user = {$uid}";
                $res = $dbr->query( $sql, __METHOD__ );
                if( $res && $dbr->numRows( $res ) > 0 ) {
                        $cache = LinkCache::singleton();
                        while( $row = $dbr->fetchObject( $res ) ) {
-                               $title = Title::newFromRow( $row );
+                               $title = Title::makeTitleSafe( $row->wl_namespace, $row->wl_title );
                                if( $title instanceof Title ) {
                                        // Update the link cache while we're at it
                                        if( $row->page_id ) {