From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 2 May 2006 23:52:15 +0000 (+0000)
Subject: * Silently ignore errors on profiling table update.
X-Git-Tag: 1.31.0-rc.0~57263
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=9e5af27557a0ebaa0e8669826c3a1e45afc580dc;p=lhc%2Fweb%2Fwiklou.git

* Silently ignore errors on profiling table update.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 530a3614b7..dd6b33ae90 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -189,6 +189,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5796) We require MySQL >=4.0.14
 * Add 'EmailConfirmed' hook
 * New findhooks.php script to find undocumented hooks.
+* Silently ignore errors on profiling table update.
+
 
 == Compatibility ==
 
diff --git a/includes/Profiling.php b/includes/Profiling.php
index 54c8ff1ddf..52d8de86ec 100644
--- a/includes/Profiling.php
+++ b/includes/Profiling.php
@@ -325,6 +325,7 @@ class Profiler {
 		$dbw = & wfGetDB(DB_MASTER);
 		if (!is_object($dbw))
 			return false;
+		$errorState = $dbw->ignoreErrors( true );
 		$profiling = $dbw->tableName('profiling');
 
 		$name = substr($name, 0, 255);
@@ -343,6 +344,7 @@ class Profiler {
 		//     "ON DUPLICATE KEY UPDATE ".
 		//     "pf_count=pf_count + VALUES(pf_count), ".
 		//     "pf_time=pf_time + VALUES(pf_time)";
+		$dbw->ignoreErrors( $errorState );
 	}
 
 	/**