Fix bug 2642 : watchdetails message using HTML instead of wiki syntax. Patch by zigge...

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

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index 37516fc..938a160 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -19,16 +19,13 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
        $fname = 'wfSpecialRecentchangeslinked';
 
        $days = $wgRequest->getInt( 'days' );
-       $target = $wgRequest->getText( 'target' );
+       $target = isset($par) ? $par : $wgRequest->getText( 'target' );
        $hideminor = $wgRequest->getBool( 'hideminor' ) ? 1 : 0;
        
-       $wgOut->setPagetitle( wfMsg( "recentchanges" ) );
+       $wgOut->setPagetitle( wfMsg( 'recentchangeslinked' ) );
        $sk = $wgUser->getSkin();
 
-       if( $par ) {
-               $target = $par;
-       }
-       if ( $target == '') {
+       if (is_null($target)) {
                $wgOut->errorpage( 'notargettitle', 'notargettext' );
                return;
        }
@@ -65,22 +62,43 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                $cmq = 'AND rev_minor_edit=0';
        } else { $cmq = ''; }
 
-       extract( $dbr->tableNames( 'categorylinks', 'links', 'revision', 'page' ) );
+       extract( $dbr->tableNames( 'categorylinks', 'pagelinks', 'revision', 'page' ) );
        
        // If target is a Category, use categorylinks and invert from and to
        if( $nt->getNamespace() == NS_CATEGORY ) {
                $catkey = $dbr->addQuotes( $nt->getDBKey() );
-               $sql = "SELECT page_id,page_namespace,page_title,rev_user,rev_comment," .
-                 "rev_user_text,rev_timestamp,rev_minor_edit,page_is_new FROM $categorylinks, $revision, $page " .
-                 "WHERE rev_timestamp > '{$cutoff}' {$cmq} AND cl_from=page_id AND cl_to=$catkey " .
-                         "GROUP BY page_id,page_namespace,page_title,rev_user,rev_comment,rev_user_text," .
-                 "rev_timestamp,rev_minor_edit,page_is_new ORDER BY rev_timestamp DESC LIMIT {$limit}";
+               $sql =
+ "SELECT page_id,page_namespace,page_title,rev_id,rev_user,rev_comment,
+         rev_user_text,rev_timestamp,rev_minor_edit,
+         page_is_new
+    FROM $categorylinks, $revision, $page
+   WHERE rev_timestamp > '{$cutoff}'
+         {$cmq}
+     AND rev_page=page_id
+     AND cl_from=page_id
+     AND cl_to=$catkey
+GROUP BY page_id,page_namespace,page_title,
+         rev_user,rev_comment,rev_user_text,rev_timestamp,rev_minor_edit,
+         page_is_new
+ORDER BY rev_timestamp DESC
+   LIMIT {$limit}";
        } else {
-               $sql = "SELECT page_id,page_namespace,page_title,rev_user,rev_comment," .
-                 "rev_user_text,rev_timestamp,rev_minor_edit,page_is_new FROM $links, $revision, $page " .
-                 "WHERE rev_timestamp > '{$cutoff}' {$cmq} AND l_to=page_id AND l_from=$id " .
-                         "GROUP BY page_id,page_namespace,page_title,rev_user,rev_comment,rev_user_text," .
-                 "rev_timestamp,rev_minor_edit,page_is_new ORDER BY rev_timestamp DESC LIMIT {$limit}";
+               $sql =
+ "SELECT page_id,page_namespace,page_title,
+         rev_user,rev_comment,rev_user_text,rev_id,rev_timestamp,rev_minor_edit,
+         page_is_new
+    FROM $pagelinks, $revision, $page
+   WHERE rev_timestamp > '{$cutoff}'
+         {$cmq}
+     AND rev_page=page_id
+     AND pl_namespace=page_namespace
+     AND pl_title=page_title
+     AND pl_from=$id
+GROUP BY page_id,page_namespace,page_title,
+         rev_user,rev_comment,rev_user_text,rev_timestamp,rev_minor_edit,
+         page_is_new
+ORDER BY rev_timestamp DESC
+   LIMIT {$limit}";
        }
        $res = $dbr->query( $sql, $fname );