From ea7d214040d8e3e0146618acd64cb0f5af39ed9e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 16 Jun 2013 15:56:41 -0700 Subject: [PATCH] Fixed mysql warning about expecting a resource. Change-Id: I799d063fec7a8e96f49db34ce669453bd26c3fb3 --- includes/db/DatabaseMysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) { -- 2.20.1