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:
c084f88
)
Swap 2 "and" for "&&"
author
Sam Reed
<reedy@users.mediawiki.org>
Sun, 27 Mar 2011 17:09:26 +0000
(17:09 +0000)
committer
Sam Reed
<reedy@users.mediawiki.org>
Sun, 27 Mar 2011 17:09:26 +0000
(17:09 +0000)
includes/User.php
patch
|
blob
|
history
diff --git
a/includes/User.php
b/includes/User.php
index
8cf872d
..
996a02c
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-1476,8
+1476,8
@@
class User {
* @return Int The user's ID; 0 if the user is anonymous or nonexistent
*/
function getId() {
- if( $this->mId === null
and
$this->mName !== null
-
and
User::isIP( $this->mName ) ) {
+ if( $this->mId === null
&&
$this->mName !== null
+
&&
User::isIP( $this->mName ) ) {
// Special case, we know the user is anonymous
return 0;
} elseif( $this->mId === null ) {