dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a3bc62
)
Fixed mysql warning about expecting a resource.
author
Aaron Schulz
<aschulz@wikimedia.org>
Sun, 16 Jun 2013 22:56:41 +0000
(15:56 -0700)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Sun, 16 Jun 2013 22:56:41 +0000
(15:56 -0700)
Change-Id: I799d063fec7a8e96f49db34ce669453bd26c3fb3
includes/db/DatabaseMysql.php
patch
|
blob
|
history
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 ) {