* (bug 10132, 10134) Restore back-compatibility Image::imageUrl() function

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

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index 92958e8..8b70020 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -1,19 +1,12 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
- *
- */
-require_once 'QueryPage.php';
-
-/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Wantedpages
+ * @addtogroup SpecialPage
  */
 class WantedPagesPage extends QueryPage {
        var $nlinks;
@@ -35,7 +28,7 @@ class WantedPagesPage extends QueryPage {
        function getSQL() {
                global $wgWantedPagesThreshold;
                $count = $wgWantedPagesThreshold - 1;
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $pagelinks = $dbr->tableName( 'pagelinks' );
                $page      = $dbr->tableName( 'page' );
                return
@@ -49,8 +42,9 @@ class WantedPagesPage extends QueryPage {
                         LEFT JOIN $page AS pg2
                         ON pl_from = pg2.page_id
                         WHERE pg1.page_namespace IS NULL
+                        AND pl_namespace NOT IN ( 2, 3 )
                         AND pg2.page_namespace != 8
-                        GROUP BY pl_namespace, pl_title
+                        GROUP BY 1,2,3
                         HAVING COUNT(*) > $count";
        }
 
@@ -81,8 +75,8 @@ class WantedPagesPage extends QueryPage {
                                # Make a redlink
                                $pageLink = $skin->makeBrokenLinkObj( $title );
                        } else {
-                               # Make a struck-out blue link
-                               $pageLink = "<s>" . $skin->makeKnownLinkObj( $title ) . "</s>";
+                               # Make a a struck-out normal link
+                               $pageLink = "<s>" . $skin->makeLinkObj( $title ) . "</s>";
                        }               
                } else {
                        # Not cached? Don't bother checking existence; it can't
@@ -91,8 +85,9 @@ class WantedPagesPage extends QueryPage {
                
                # Make a link to "what links here" if it's required
                $wlhLink = $this->nlinks
-                                       ? $this->makeWlhLink( $title, $skin, wfMsgHtml( 'nlinks',
-                                                       $wgLang->formatNum( $result->value ) ) )
+                                       ? $this->makeWlhLink( $title, $skin,
+                                                       wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
+                                                               $wgLang->formatNum( $result->value ) ) )
                                        : null;
                                        
                return wfSpecialList($pageLink, $wlhLink);
@@ -106,7 +101,7 @@ class WantedPagesPage extends QueryPage {
         * @return string
         */
        function makeWlhLink( &$title, &$skin, $text ) {
-               $wlhTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
+               $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere' );
                return $skin->makeKnownLinkObj( $wlhTitle, $text, 'target=' . $title->getPrefixedUrl() );
        }