From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 16 Jun 2013 22:56:41 +0000 (-0700)
Subject: Fixed mysql warning about expecting a resource.
X-Git-Tag: 1.31.0-rc.0~19414
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=ea7d214040d8e3e0146618acd64cb0f5af39ed9e;p=lhc%2Fweb%2Fwiklou.git

Fixed mysql warning about expecting a resource.

Change-Id: I799d063fec7a8e96f49db34ce669453bd26c3fb3
---

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 1cd14a1ae2..b75d615b10 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -164,7 +164,7 @@ class DatabaseMysql extends DatabaseMysqlBase {
 	}
 
 	protected function mysqlError( $conn = null ) {
-		return mysql_error( $conn );
+		return ( $conn !== null ) ? mysql_error( $conn ) : mysql_error(); // avoid warning
 	}
 
 	protected function mysqlRealEscapeString( $s ) {