Merge "Add attributes parameter to ShowSearchHitTitle"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / DatabaseMysql.php

diff --git a/includes/libs/rdbms/database/DatabaseMysql.php b/includes/libs/rdbms/database/DatabaseMysql.php
index c0c9223..58b0926 100644 (file)
--- a/includes/libs/rdbms/database/DatabaseMysql.php
+++ b/includes/libs/rdbms/database/DatabaseMysql.php
@@ -22,11 +22,12 @@
  */
 namespace Wikimedia\Rdbms;
 
-use DBConnectionError;
-
 /**
  * Database abstraction object for PHP extension mysql.
  *
+ * @deprecated 1.30 PHP extension 'mysql' was deprecated in PHP 5.5 and removed in PHP 7.0.
+ * @see PHP extension 'mysqli' and DatabaseMysqli
+ *
  * @ingroup Database
  * @see Database
  */
@@ -202,7 +203,7 @@ class DatabaseMysql extends DatabaseMysqlBase {
        protected function mysqlRealEscapeString( $s ) {
                $conn = $this->getBindingHandle();
 
-               return mysql_real_escape_string( $s, $conn );
+               return mysql_real_escape_string( (string)$s, $conn );
        }
 }