From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/ViewCountUpdate.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'includes/ViewCountUpdate.php')

diff --git a/includes/ViewCountUpdate.php b/includes/ViewCountUpdate.php
index 28ba3414..22a46493 100644
--- a/includes/ViewCountUpdate.php
+++ b/includes/ViewCountUpdate.php
@@ -53,16 +53,13 @@ class ViewCountUpdate implements DeferrableUpdate {
 		}
 
 		# Not important enough to warrant an error page in case of failure
-		$oldignore = $dbw->ignoreErrors( true );
-
-		$dbw->insert( 'hitcounter', array( 'hc_id' => $this->id ), __METHOD__ );
-
-		$checkfreq = intval( $wgHitcounterUpdateFreq / 25 + 1 );
-		if ( rand() % $checkfreq == 0 && $dbw->lastErrno() == 0 ) {
-			$this->collect();
-		}
-
-		$dbw->ignoreErrors( $oldignore );
+		try {
+			$dbw->insert( 'hitcounter', array( 'hc_id' => $this->id ), __METHOD__ );
+			$checkfreq = intval( $wgHitcounterUpdateFreq / 25 + 1 );
+			if ( rand() % $checkfreq == 0 && $dbw->lastErrno() == 0 ) {
+				$this->collect();
+			}
+		} catch ( DBError $e ) {}
 	}
 
 	protected function collect() {
-- 
cgit v1.2.2