Fixed mysql warning about expecting a resource.

Change-Id: I799d063fec7a8e96f49db34ce669453bd26c3fb3

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 1cd14a1..b75d615 100644 (file)
--- 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 ) {