revert erronous commit, s/:r/:e/ ...

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

diff --git a/includes/SpecialUnwatchedpages.php b/includes/SpecialUnwatchedpages.php
index f34df4f..1111f1c 100644 (file)
--- a/includes/SpecialUnwatchedpages.php
+++ b/includes/SpecialUnwatchedpages.php
@@ -6,6 +6,7 @@
  * @subpackage SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
@@ -34,10 +35,10 @@ class UnwatchedpagesPage extends QueryPage {
                                page_namespace as value
                        FROM $page
                        LEFT JOIN $watchlist ON wl_namespace = page_namespace AND page_title = wl_title
-                       WHERE wl_title IS NULL
+                       WHERE wl_title IS NULL AND page_is_redirect = 0
                        ";
        }
-       
+
        function sortDescending() { return false; }
 
        function formatResult( $skin, $result ) {
@@ -45,10 +46,11 @@ class UnwatchedpagesPage extends QueryPage {
 
                $nt = Title::makeTitle( $result->namespace, $result->title );
                $text = $wgContLang->convert( $nt->getPrefixedText() );
-               
-               $plink = $skin->makeKnownLink( $nt->getPrefixedText(), htmlspecialchars( $text ) );
-               
-               return $plink;
+
+               $plink = $skin->makeKnownLinkObj( $nt, htmlspecialchars( $text ) );
+               $wlink = $skin->makeKnownLinkObj( $nt, wfMsgHtml( 'watch' ), 'action=watch' );
+
+               return $plink . ' (' . $wlink . ')';
        }
 }
 
@@ -56,6 +58,11 @@ class UnwatchedpagesPage extends QueryPage {
  * constructor
  */
 function wfSpecialUnwatchedpages() {
+       global $wgUser, $wgOut;
+
+       if ( ! $wgUser->isAllowed( 'unwatchedpages' ) )
+               return $wgOut->permissionRequired( 'unwatchedpages' );
+
        list( $limit, $offset ) = wfCheckLimits();
 
        $wpp = new UnwatchedpagesPage();