* (bug 4280) Use 'noindex,nofollow' instead of 'noindex,follow' for default

  meta robots tag on diff view and special pages. Should reduce impact of
  robots on scrolling special pages, diffs etc on sites where robots.txt
  doesn't forbid access.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 488aaa6..bb1457f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -450,6 +450,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   to <div class="center">. <center> is perfectly valid in the target doctype
   (XHTML 1.0 Transitional), while the replacement didn't catch all cases and
   could even result in invalid output from valid input. 
+* (bug 4280) Use 'noindex,nofollow' instead of 'noindex,follow' for default
+  meta robots tag on diff view and special pages. Should reduce impact of
+  robots on scrolling special pages, diffs etc on sites where robots.txt
+  doesn't forbid access.
 
 
 == Compatibility ==

diff --git a/includes/Article.php b/includes/Article.php
index 4da96b8..1162a9c 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1438,7 +1438,7 @@ class Article {
         */
        function markpatrolled() {
                global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUser;
-               $wgOut->setRobotpolicy( 'noindex,follow' );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                # Check RC patrol config. option
                if( !$wgUseRCPatrol ) {
@@ -1487,7 +1487,7 @@ class Article {
                
                if( $this->doWatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
-                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                        $link = $this->mTitle->getPrefixedText();
                        $text = wfMsg( 'addedwatchtext', $link );
@@ -1535,7 +1535,7 @@ class Article {
                
                if( $this->doUnwatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
-                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                        $link = $this->mTitle->getPrefixedText();
                        $text = wfMsg( 'removedwatchtext', $link );

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index ac25fc6..490a889 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -138,7 +138,7 @@ CONTROL;
                        $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
                }
                $wgOut->setSubtitle( wfMsg( 'difference' ) );
-               $wgOut->setRobotpolicy( 'noindex,follow' );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) {
                        $wgOut->loginToUse();

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 8dc51c1..ac7e0e2 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -291,7 +291,7 @@ class SpecialPage
                                        $retVal = $redir;
                                } else {
                                        $wgOut->setArticleRelated( false );
-                                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
                                        $wgOut->setStatusCode( 404 );
                                        $wgOut->errorpage( 'nosuchspecialpage', 'nospecialpagetext' );
                                        $retVal = false;
@@ -428,7 +428,7 @@ class SpecialPage
        function setHeaders() {
                global $wgOut;
                $wgOut->setArticleRelated( false );
-               $wgOut->setRobotPolicy( "noindex,follow" );
+               $wgOut->setRobotPolicy( "noindex,nofollow" );
                $wgOut->setPageTitle( $this->getDescription() );
        }