Merge "Prevent Google indexing of the SiteNotice div"

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 5604bc2..40318c0 100644 (file)
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1559,6 +1559,11 @@ abstract class Skin extends ContextSource {
                }
 
                wfRunHooks( 'SiteNoticeAfter', array( &$siteNotice, $this ) );
+
+               // Prevent Google from indexing announcements, cos this dilutes
+               // content results.
+               $siteNotice = "<!--googleoff: all-->{$siteNotice}<!--googleon: all-->";
+
                wfProfileOut( __METHOD__ );
                return $siteNotice;
        }