From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 24 Sep 2008 17:28:55 +0000 (+0000)
Subject: Another fix for r41086. Don't keep retrying server if connection fails.
X-Git-Tag: 1.31.0-rc.0~45111
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=6683eeca5b794e16b9edc2dba42d31c75ed3c36f;p=lhc%2Fweb%2Fwiklou.git

Another fix for r41086. Don't keep retrying server if connection fails.
---

diff --git a/includes/ExternalStore.php b/includes/ExternalStore.php
index 34570e2df2..272bcfc000 100644
--- a/includes/ExternalStore.php
+++ b/includes/ExternalStore.php
@@ -92,12 +92,12 @@ class ExternalStore {
 				$url = $store->store( $params, $data ); // Try to save the object
 			} catch ( DBConnectionError $error ) {
 				$url = false;
-				unset( $tryStores[$index] ); // Don't try this one again!
-				$tryStores = array_values( $tryStores ); // Must have consecutive keys
 			}
 			if ( $url ) {
 				return $url; // Done!
 			} else {
+				unset( $tryStores[$index] ); // Don't try this one again!
+				$tryStores = array_values( $tryStores ); // Must have consecutive keys
 				wfDebugLog( 'ExternalStorage', "Unable to store text to external storage $storeUrl" );
 			}
 		}