* (bug 1754) Patch by Anders Wegge Jakobsen: Both Atom and RSS were using the

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

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index d1e9c28..fa7e0b3 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -100,9 +100,9 @@ function makeHTMLText( $messages ) {
 
        <table border='1' cellspacing='0' width='100%'>
        <tr bgcolor='#b2b2ff'>
-               <th>Name</th>
-               <th>Default text</th>
-               <th>Current text</th>
+               <th>" . wfMsg('allmessagesname') . "</th>
+               <th>" . wfMsg('allmessagesdefault') . "</th>
+               <th>" . wfMsg('allmessagescurrent')  . "</th>
        </tr>";
        
        wfProfileIn( "$fname-check" );
@@ -113,11 +113,11 @@ function makeHTMLText( $messages ) {
                NS_MEDIAWIKI_TALK => array()
        );
        $dbr =& wfGetDB( DB_SLAVE );
-       $res = $dbr->select( 'cur',
-               array( 'cur_namespace', 'cur_title' ),
-               "cur_namespace IN (" . NS_MEDIAWIKI . ", " . NS_MEDIAWIKI_TALK . ")" );
+       $page = $dbr->tableName( 'page' );
+       $sql = "SELECT page_namespace,page_title FROM $page WHERE page_namespace IN (" . NS_MEDIAWIKI . ", " . NS_MEDIAWIKI_TALK . ")";
+       $res = $dbr->query( $sql );
        while( $s = $dbr->fetchObject( $res ) ) {
-               $pageExists[$s->cur_namespace][$s->cur_title] = true;
+               $pageExists[$s->page_namespace][$s->page_title] = true;
        }
        $dbr->freeResult( $res );
        wfProfileOut( "$fname-check" );