From c83ea550e30a5dacd45fdec190a5d721eacb5c3d Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 6 Dec 2003 02:09:48 +0000
Subject: [PATCH] MediaWiki: namespace memcached synchronisation

---
 includes/Article.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/includes/Article.php b/includes/Article.php
index 4bc527bc1c..84bbdad376 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1080,7 +1080,14 @@ class Article {
 
 			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 				$messageCache = $wgMemc->get( "$wgDBname:messages" );
-				if (!$messageCache) {
+
+				# If another thread is loading, poll
+				for ( $i=0; $i<70 && $messageCache == 'loading'; $i++ ) {
+					sleep(1);
+					$messageCache = $wgMemc->get( "$wgDBname:messages" );
+				}
+				
+				if ( !$messageCache || $messageCache == 'loading' ) {
 					$messageCache = wfLoadAllMessages();
 				}
 				$messageCache[$this->mTitle->getDBkey()] = $text;
@@ -1172,6 +1179,14 @@ class Article {
 		$mw =& MagicWord::get( MAG_SUBST );
 		$text = $mw->substituteCallback( $text, "wfReplaceSubstVar" );
 
+/* Experimental:
+		# Trim trailing whitespace
+		# MAG_END (__END__) tag allows for trailing 
+		# whitespace to be deliberately included
+		$text = rtrim( $text );
+		$mw =& MagicWord::get( MAG_END );
+		$mw->matchAndRemove( $text );
+*/
 		return $text;
 	}
 
-- 
2.20.1